]> git.sesse.net Git - kdenlive/commit
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)
commit09194484c415d7a7645bcf7c2245cc753059ea4c
treefb8176bb521cb02900bf1c975b8bbe0d6e28470a
parent71e41ad0c197e2e2eb033dff7800427f64d3428f
parentd385077e0eab07915166924ca41d9fa807072cf0
Merge branch 'master' into feature/pkey
src/customtrackview.cpp
src/customtrackview.h
src/mainwindow.cpp