]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'pkey'
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sat, 10 Nov 2012 14:58:59 +0000 (15:58 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sat, 10 Nov 2012 14:58:59 +0000 (15:58 +0100)
1  2 
src/customtrackview.cpp
src/mainwindow.cpp

Simple merge
Simple merge