gstreamer/tests
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
..
check Merge remote-tracking branch 'origin/master' into 0.11 2012-03-12 15:25:49 +00:00
examples Merge remote-tracking branch 'origin/master' into 0.11 2012-03-12 15:25:49 +00:00
Makefile.am Don't build the examples if it's disabled in configure 2011-08-31 11:05:02 -07:00