]> git.sesse.net Git - kdenlive/commitdiff
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)
1  2 
src/mainwindow.cpp
src/mainwindow.h

Simple merge
Simple merge