]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'feature/pkey' of git://anongit.kde.org/kdenlive into pkey
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sat, 10 Nov 2012 14:57:59 +0000 (15:57 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sat, 10 Nov 2012 14:57:59 +0000 (15:57 +0100)
1  2 
src/mainwindow.cpp

Simple merge