]> git.sesse.net Git - kdenlive/commit
Merge branch 'master' into feature/pkey
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)
commit71e41ad0c197e2e2eb033dff7800427f64d3428f
tree49e90713562bad7d381337eded26867752b51742
parente5bed1802f629406c47711f2a6e26f7c0286b11f
parent7d497f69997e1b4734c66d0dcd29a2ca7e252e69
Merge branch 'master' into feature/pkey
src/customtrackview.cpp
src/customtrackview.h
src/mainwindow.cpp