Merge branch 'eldruin_tool2' into eldruin_ffmpeg2
authorDiego Barrios Romero <eldruin@gmailcom>
Sat, 20 Feb 2010 15:34:40 +0000 (16:34 +0100)
committerDiego Barrios Romero <eldruin@gmailcom>
Sat, 20 Feb 2010 15:34:40 +0000 (16:34 +0100)
commit5eccd51f77694fb18d4618ee78c822de006fa5e6
treef348003227a90dd482d03ba5908c01f250b42c38
parent6202fa9106fb2e71a2684094cb534eda9588fadd
parentac82dc73a5ed08bd695c70a3ac70caaa3e546302
Merge branch 'eldruin_tool2' into eldruin_ffmpeg2
synfig-core/src/tool/main.cpp