Barcode scanner library for Android, based on the ZXing decoder (mirror) https://git.radix-linux.su/ZXing/zxing-android-embedded.git/atom?h=1.1.x 2013-07-09T13:40:10+00:00 2013-07-09T13:40:10+00:00 Ralf Kistner ralf.kistner@gmail.com 2013-07-09T13:35:11+00:00 urn:sha1:470f89c74683fce963bb973e40a619e10c3eb4eb Conflicts: AndroidManifest.xml assets/html-de/index.html assets/html-de/whatsnew.html assets/html-en/index.html assets/html-es/index.html assets/html-es/whatsnew.html assets/html-fr/index.html assets/html-fr/whatsnew.html assets/html-it/index.html assets/html-it/whatsnew.html assets/html-ja/index.html assets/html-ja/whatsnew.html assets/html-ko/index.html assets/html-ko/whatsnew.html assets/html-nl/index.html assets/html-nl/whatsnew.html assets/html-pt/index.html assets/html-pt/whatsnew.html assets/html-ru/index.html assets/html-ru/whatsnew.html assets/html-zh-rCN/index.html assets/html-zh-rCN/whatsnew.html assets/html-zh-rTW/index.html assets/html-zh-rTW/whatsnew.html res/layout/bookmark_picker_list_item.xml src/com/google/zxing/client/android/CaptureActivity.java src/com/google/zxing/client/android/CaptureActivityHandler.java src/com/google/zxing/client/android/HttpHelper.java src/com/google/zxing/client/android/LocaleManager.java src/com/google/zxing/client/android/book/SearchBookContentsResult.java src/com/google/zxing/client/android/history/HistoryManager.java src/com/google/zxing/client/android/result/AddressBookResultHandler.java src/com/google/zxing/client/android/result/ProductResultHandler.java src/com/google/zxing/client/android/result/ResultHandler.java src/com/google/zxing/client/android/result/SMSResultHandler.java src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java src/com/google/zxing/client/android/share/AppPickerActivity.java src/com/google/zxing/client/android/share/BookmarkPickerActivity.java src/com/google/zxing/client/android/share/LoadPackagesAsyncTask.java src/com/google/zxing/client/android/share/ShareActivity.java src/com/google/zxing/client/android/wifi/WifiConfigManager.java 2013-05-14T11:18:25+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-05-14T11:18:25+00:00 urn:sha1:15cc3b6c91c0256339a2751c629308bd2094b73a git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2791 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-05-09T10:04:06+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-05-09T10:04:06+00:00 urn:sha1:ab89dbedce8549639fbce2e13a09e2fe908cce95 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2718 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-24T16:32:55+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-24T16:32:55+00:00 urn:sha1:56b712fc9e483d3ad8196dd963abbb7e98a2e5d7 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2686 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-24T10:28:19+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-24T10:28:19+00:00 urn:sha1:5bb8e9dcf2946b2a9484985d9dfea92880edd554 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2685 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-22T10:12:50+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-22T10:12:50+00:00 urn:sha1:806e002db2d1a2c9daa0bd2c7b6f6fbdc0d7ad9b git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2678 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-14T18:11:26+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-14T18:11:26+00:00 urn:sha1:76ad75aab180fd50dd29bf3f0c4d65950517ec58 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2652 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-13T11:50:59+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-13T11:50:59+00:00 urn:sha1:78214b243edeef79edb1b59844ecd1fe945c96d6 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2651 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-10T16:37:26+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-10T16:37:26+00:00 urn:sha1:b354c19d2427a51810664bf9f6a39270d0970da0 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2646 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-06T18:06:09+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-06T18:06:09+00:00 urn:sha1:646112674fdb02faf2b03b6932f2eba4e9358069 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2620 59b500cc-1b3d-0410-9834-0bbf25fbcc57