]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into feature/pkey
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Tue, 6 Nov 2012 16:20:28 +0000 (17:20 +0100)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Tue, 6 Nov 2012 16:20:28 +0000 (17:20 +0100)
1  2 
src/customtrackview.cpp

Simple merge