]> git.sesse.net Git - mlt/commitdiff
Merge branch 'master' of dennedy.org:git/mltframework.org/mlt
authorDan Dennedy <dan@dennedy.org>
Mon, 15 Feb 2010 04:18:43 +0000 (20:18 -0800)
committerDan Dennedy <dan@dennedy.org>
Mon, 15 Feb 2010 04:18:43 +0000 (20:18 -0800)
1  2 
src/framework/mlt_frame.c

Simple merge