]> git.sesse.net Git - mlt/commit
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)
commit35d237661cb43067ed38fbc1605f4144be0ec431
tree53d8414f92eb50d0857a0bb82076bfe91d6738c2
parent75ed0b328ed38d80b63de671371726025d0fbdcf
parent763dddaf033b93befbd38bbdabb3c373be4f5450
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Conflicts:
src/modules/qimage/kdenlivetitle_wrapper.cpp