]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 27 Nov 2012 21:51:10 +0000 (22:51 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 27 Nov 2012 21:51:10 +0000 (22:51 +0100)
1  2 
src/mainwindow.cpp

Simple merge