]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'audioAlign' of git://anongit.kde.org/kdenlive into audioAlign
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 17 Feb 2012 11:07:19 +0000 (12:07 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 17 Feb 2012 11:07:19 +0000 (12:07 +0100)

Trivial merge