Edward Hervey 4917e16458 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: tests/examples/camerabin2/Makefile.am		2011-12-30 11:49:27 +01:00
..
check	Merge remote-tracking branch 'origin/master' into 0.11-premerge	2011-12-30 11:41:17 +01:00
examples	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-30 11:49:27 +01:00
files	tests: add very simple zbar unit test	2010-11-05 00:23:45 +00:00
icles	controller: port to new interpolation-mode api	2011-12-19 23:51:19 +01:00
Makefile.am	tests: add very simple zbar unit test	2010-11-05 00:23:45 +00:00