Wim Taymans dbdaa23742 Merge branch 'master' into 0.11 ... Conflicts: gst/colorspace/colorspace.c		2011-11-09 12:19:04 +01:00
..
check	Merge branch 'master' into 0.11	2011-11-09 12:19:04 +01: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