]> git.sesse.net Git - mlt/commitdiff
Merge branch 'frei0r-metadata'
authorDan Dennedy <dan@dennedy.org>
Sun, 17 Mar 2013 20:15:37 +0000 (13:15 -0700)
committerDan Dennedy <dan@dennedy.org>
Sun, 17 Mar 2013 20:15:37 +0000 (13:15 -0700)
1  2 
src/modules/frei0r/factory.c

Simple merge