Nick German 80a3632a15 Merge branch 'master' of https://github.com/nickgerman/csZBar ...

Conflicts:
	android/ZBarScannerActivity.java
	android/res/layout/cszbarscanner.xml
	plugin.xml

2015-03-26 07:27:36 +10:00

..

libs

Android now uses auto focus, assigns and enables all barcode types

2015-03-26 07:22:39 +10:00

res/layout

Android now uses auto focus, assigns and enables all barcode types

2015-03-26 07:22:39 +10:00

BarcodeFormat.java

Android now uses auto focus, assigns and enables all barcode types

2015-03-26 07:22:39 +10:00

ZBar.java

Android now uses auto focus, assigns and enables all barcode types

2015-03-26 07:22:39 +10:00

ZBarScannerActivity.java

Merge branch 'master' of https://github.com/nickgerman/csZBar

2015-03-26 07:27:36 +10:00