]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' into feature/pkey
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Tue, 30 Oct 2012 07:05:15 +0000 (08:05 +0100)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Tue, 30 Oct 2012 07:05:15 +0000 (08:05 +0100)
1  2 
src/customtrackview.cpp
src/customtrackview.h
src/mainwindow.cpp

Simple merge
Simple merge
Simple merge