]> git.sesse.net Git - kdenlive/commit - src/mainwindow.cpp
Merge branch 'master' into effectstack
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 19 Mar 2012 13:05:53 +0000 (14:05 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 19 Mar 2012 13:05:53 +0000 (14:05 +0100)
commita1f0a54b93ab364a37fd8242c1881c61d066ada7
tree734fefea46344227154cea90df541441a8cf951a
parentff74d33cf1d0a008133cf2d23b78060bdf28a1d6
parent7cd7234fe261491efe2f9e55be980c326ee0a002
Merge branch 'master' into effectstack

Conflicts:
src/CMakeLists.txt
src/CMakeLists.txt
src/mainwindow.cpp
src/mainwindow.h