]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into stabilize
authorMarco Gittler <marco@gitma.de>
Sun, 11 Dec 2011 16:04:11 +0000 (17:04 +0100)
committerMarco Gittler <marco@gitma.de>
Sun, 11 Dec 2011 16:04:11 +0000 (17:04 +0100)
1  2 
src/CMakeLists.txt
src/mainwindow.cpp

Simple merge
Simple merge