]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into bugfix/jogshuttle
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Thu, 22 Nov 2012 10:17:18 +0000 (11:17 +0100)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Thu, 22 Nov 2012 10:17:18 +0000 (11:17 +0100)
1  2 
src/mainwindow.cpp

Simple merge