]> git.sesse.net Git - mlt/commitdiff
Merge branch 'mlt_framebuffer' of git://github.com/j-b-m/mlt
authorDan Dennedy <dan@dennedy.org>
Thu, 10 Sep 2009 05:33:23 +0000 (22:33 -0700)
committerDan Dennedy <dan@dennedy.org>
Thu, 10 Sep 2009 05:33:23 +0000 (22:33 -0700)

Trivial merge