]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into feature/pkey
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Wed, 31 Oct 2012 06:56:55 +0000 (07:56 +0100)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Wed, 31 Oct 2012 06:56:55 +0000 (07:56 +0100)
Conflicts:
src/mainwindow.h


No differences found