]> git.sesse.net Git - mlt/commit
kdenlivetitle_wrapper.cpp: fixed merge conflict
authorgmarco <g.marco@freenet.de>
Mon, 27 Jul 2009 18:18:11 +0000 (20:18 +0200)
committergmarco <g.marco@freenet.de>
Mon, 27 Jul 2009 18:18:11 +0000 (20:18 +0200)
commitb0bbefea738836e3112054528dabc184edc9ba80
tree7adddb201ec1769a934438129ee64809bc62ba4c
parent1e4f86ca42bbec73d8fd763efe1671cdf7dfae61
kdenlivetitle_wrapper.cpp: fixed merge conflict
src/modules/qimage/kdenlivetitle_wrapper.cpp