]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 13 Jan 2012 10:49:29 +0000 (11:49 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 13 Jan 2012 10:49:29 +0000 (11:49 +0100)
1  2 
src/renderer.cpp

Simple merge