gstreamer/tools
Tim-Philipp Müller 5d02075d9b Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	bindings/python/Makefile.am
	bindings/python/ges-types.defs
	bindings/python/ges.defs
	bindings/python/ges.override
	bindings/python/gesmodule.c
	bindings/python/testsuite/test_textoverlay.py
2012-03-12 15:25:49 +00:00
..
.gitignore Opening the 0.11 branch 2011-08-05 13:24:44 +02:00
ges-launch.c Merge remote-tracking branch 'origin/master' into 0.11 2012-03-12 15:25:49 +00:00
Makefile.am android: make it ready for androgenizer 2011-04-11 17:15:55 +02:00