]> git.sesse.net Git - mlt/commit
Merge branch 'jbm-kdenlivetitle' into kdenlivetitle
authorMarco Gittler <g.marco@freenet.de>
Fri, 24 Jul 2009 09:39:03 +0000 (11:39 +0200)
committerMarco Gittler <g.marco@freenet.de>
Fri, 24 Jul 2009 09:39:03 +0000 (11:39 +0200)
commita0f0118c1066a4e080830bb76433717434de6fc1
treee706a77cbd13aca739e2f6ff27c12d586db325a6
parentaef6ce18eda199d60e48ea98c7e382cc249c95a8
parentf95348b1b45ec12cd94db1298c87be1de30dc651
Merge branch 'jbm-kdenlivetitle' into kdenlivetitle

Conflicts:
src/modules/qimage/factory.c
src/modules/qimage/kdenlivetitle_wrapper.cpp
src/modules/qimage/kdenlivetitle_wrapper.h
src/modules/qimage/producer_kdenlivetitle.c
src/modules/qimage/kdenlivetitle_wrapper.cpp
src/modules/qimage/kdenlivetitle_wrapper.h
src/modules/qimage/producer_kdenlivetitle.c