Tim-Philipp Müller 77361e2919 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: ext/opus/gstopusdec.c ext/opus/gstopusparse.c gst-libs/gst/video/gstbasevideodecoder.c gst-libs/gst/video/gstbasevideodecoder.h		2011-11-26 15:37:25 +00:00
..
check	Merge remote-tracking branch 'origin/master' into 0.11	2011-11-26 15:37:25 +00:00
examples	update for probe api changes	2011-11-08 11:28:41 +01:00
files	tests: add very simple zbar unit test	2010-11-05 00:23:45 +00:00
icles	controller: port to new controller location and api	2011-11-04 20:14:01 +01:00
Makefile.am	tests: add very simple zbar unit test	2010-11-05 00:23:45 +00:00