]> git.sur5r.net Git - minitube/commit
projects / minitube / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9fa89c6 4ad5f2c)
Merge branch 'dualscreen_fix' of gitorious.org:~stiat/minitube/stiats-minitube into...
authorGeorg Grabler <georg@grabler.net>
Sat, 5 Feb 2011 16:58:42 +0000 (16:58 +0000)
committerGeorg Grabler <georg@grabler.net>
Sat, 5 Feb 2011 16:58:42 +0000 (16:58 +0000)
commit7ab6762442984edca4ba1d060b4b6eafd9abb248
treee50f40a02f49e690844e16c2e7b9eaf586717f3btree | snapshot
parent9fa89c655abe22639ecc8a34ba3f1d18fc77d644commit | diff
parent4ad5f2c3188e21a4489b1199ac0630599cca5db7commit | diff
Merge branch 'dualscreen_fix' of gitorious.org:~stiat/minitube/stiats-minitube into dualscreen_fix
* re-initialized local branch and went for another solution

Conflicts:
src/MainWindow.cpp
src/videoareawidget.cpp
src/MainWindow.cpp diff1 | diff2 | blob | history
Minitube Debian packaging