akshayaurora c121c1aa4e reorganize files and bring code inline with current master ...

Conflicts:
	lib/simple_config.py

2015-09-03 14:20:37 +02:00

..

libiconv.so

…

libzbarjni.so

…

zbar.jar

…