1
0

reorganize files and bring code inline with current master

Conflicts:
	lib/simple_config.py
This commit is contained in:
akshayaurora
2014-06-05 06:12:29 +05:30
committed by ThomasV
parent 9938316400
commit c121c1aa4e
67 changed files with 5360 additions and 2408 deletions

BIN
lib/android/libiconv.so Normal file

Binary file not shown.

BIN
lib/android/libzbarjni.so Normal file

Binary file not shown.

BIN
lib/android/zbar.jar Normal file

Binary file not shown.