diff options
| author | Ralf Kistner <ralf.kistner@gmail.com> | 2013-07-09 17:35:11 +0400 |
|---|---|---|
| committer | Ralf Kistner <ralf.kistner@gmail.com> | 2013-07-09 17:40:10 +0400 |
| commit | 470f89c74683fce963bb973e40a619e10c3eb4eb (patch) | |
| tree | 380287257963d78df2d4cd288464297c0425a1bb /sample/src/main/java/example/zxing/MainActivity.java | |
| parent | 4763693153a9cac3c49027caddd23849c77c2c36 (diff) | |
| parent | e4421ef961b4a8e2fb7df5b9ce7dc17bf248c949 (diff) | |
| download | zxing-android-embedded-470f89c74683fce963bb973e40a619e10c3eb4eb.tar.xz | |
Merge branch 'upstream-2.2'
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
Diffstat (limited to 'sample/src/main/java/example/zxing/MainActivity.java')
0 files changed, 0 insertions, 0 deletions