]> git.sesse.net Git - mlt/commitdiff
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
authorgmarco <g.marco@freenet.de>
Tue, 1 Sep 2009 18:40:33 +0000 (20:40 +0200)
committergmarco <g.marco@freenet.de>
Tue, 1 Sep 2009 18:40:33 +0000 (20:40 +0200)
Conflicts:
src/modules/qimage/kdenlivetitle_wrapper.cpp


Trivial merge