gstreamer/tests
Sebastian Dröge a01a4ea2d3 Merge branch 'master' into 0.11
Conflicts:
	gst/mpegtsdemux/tsdemux.c
	gst/videoparsers/gsth264parse.c
	tests/check/elements/camerabin2.c
2012-01-10 15:50:37 +01:00
..
check Merge branch 'master' into 0.11 2012-01-10 15:50:37 +01:00
examples Merge branch 'master' into 0.11 2012-01-10 15:50:37 +01:00
files tests: add very simple zbar unit test 2010-11-05 00:23:45 +00:00
icles controller: port to API changes 2011-12-31 10:03:10 +01:00
Makefile.am tests: add very simple zbar unit test 2010-11-05 00:23:45 +00:00