]> git.sesse.net Git - kdenlive/commit
Merge branch 'next' into audioAlign
authorSimon A. Eugster <simon.eu@gmail.com>
Wed, 15 Feb 2012 17:44:28 +0000 (18:44 +0100)
committerSimon A. Eugster <simon.eu@gmail.com>
Wed, 15 Feb 2012 17:44:28 +0000 (18:44 +0100)
commit05f4fad9a19434399f43ff76e06d1e1a5f74c0f6
tree456aefcf6b986e9d9d91947a3f408c68e883b288
parenta7be14d538d33a1f4ecb88df578af1fdbf042382
parent82ae0da8cd3977300573b766916e9183022a412e
Merge branch 'next' into audioAlign

Conflicts:
src/lib/CMakeLists.txt
.gitignore
src/CMakeLists.txt
src/lib/CMakeLists.txt