]> git.sesse.net Git - kdenlive/commit
Merge branch 'master' into feature/pkey
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Sat, 3 Nov 2012 17:53:21 +0000 (18:53 +0100)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Sat, 3 Nov 2012 17:53:21 +0000 (18:53 +0100)
commitba471399b55c3b761ccc7aa5008c25bd43cfe90b
tree22c51edf3878dd8a1d437f082488bc412f4e8aa6
parentb8684fb22577d9e5b19944d814840187690b51c2
parent76c9abb930245e56533fb0282b919deb33a6d126
Merge branch 'master' into feature/pkey
src/mainwindow.cpp
src/mainwindow.h