]> git.sesse.net Git - mlt/commit
Merge branch 'review-2' of git://github.com/rayl/mlt
authorddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Fri, 10 Apr 2009 07:54:00 +0000 (07:54 +0000)
committerddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Fri, 10 Apr 2009 07:54:00 +0000 (07:54 +0000)
commit412ee02b6df734514820b24afaebab8939741645
tree9bf85a67a900290090b767131f77410004302e7c
parentd5d878221c3123ef1d3a335dbc2b1878b3fdb983
parentf13ee0890b643f2c2eb220290f8374c80605a505
Merge branch 'review-2' of git://github.com/rayl/mlt

Conflicts:
src/miracle/miracle_connection.c

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1398 d19143bc-622f-0410-bfdd-b5b2a6649095
src/miracle/miracle_connection.c