]> git.sesse.net Git - kdenlive/commit
Merge branch 'master' into feature/pkey
authorEd Rogalsky <ed.rogalsky@googlemail.com>
Wed, 31 Oct 2012 06:56:55 +0000 (07:56 +0100)
committerEd Rogalsky <ed.rogalsky@googlemail.com>
Wed, 31 Oct 2012 06:56:55 +0000 (07:56 +0100)
commitb8684fb22577d9e5b19944d814840187690b51c2
treea1ca3dbf8f193ea7328ae55c18867b8260e358e6
parent09194484c415d7a7645bcf7c2245cc753059ea4c
parentbf5a5feff2432c0d9be38d0782c2d3ec10cd6739
Merge branch 'master' into feature/pkey

Conflicts:
src/mainwindow.h
src/customtrackview.cpp
src/customtrackview.h
src/mainwindow.cpp
src/mainwindow.h