]> git.sur5r.net Git - minitube/commit
* Fixed a lot of cross-merging, ** up the branches before
authorGeorg Grabler <georg@grabler.net>
Sat, 5 Feb 2011 17:12:19 +0000 (17:12 +0000)
committerGeorg Grabler <georg@grabler.net>
Sat, 5 Feb 2011 17:12:19 +0000 (17:12 +0000)
commitbc43cd3f428137e3297bd621d52364b93dca19fd
treeeb1ce5903e9b07a1f1c3f7d0c59297c2b76a8f72
parent52994f97e0e4d1611e824cb6ab8a6bd7951d1c24
* Fixed a lot of cross-merging, ** up the branches before
src/MainWindow.cpp
src/MainWindow.h
src/MediaView.cpp
src/MediaView.h
src/videoareawidget.cpp