diff options
| author | Ralf Kistner <ralf@embarkmobile.com> | 2015-04-01 14:04:36 +0300 |
|---|---|---|
| committer | Ralf Kistner <ralf@embarkmobile.com> | 2015-04-01 14:04:36 +0300 |
| commit | d16d2766e916dc7716538e2cd62f90650f66d738 (patch) | |
| tree | 9d86d6695b186a3e76eff36b146a80bfaa76cab5 /sample/src/main/java/example/zxing/MainActivity.java | |
| parent | fcd59828615b46d43d096c3c947475e022d454f8 (diff) | |
| parent | 4cd625271320021ff03f667097234dbae471e4e7 (diff) | |
| download | zxing-android-embedded-d16d2766e916dc7716538e2cd62f90650f66d738.tar.xz | |
Merge branch 'master' into rewrite
Conflicts:
zxing-android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
Diffstat (limited to 'sample/src/main/java/example/zxing/MainActivity.java')
0 files changed, 0 insertions, 0 deletions