diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
| commit | 389d191448a3caf6d809552e9af63a62b9695bd3 (patch) | |
| tree | f048ab23f812a5472ec17944dd2e7e9683253f5e /extern/zxing-android-integration | |
| parent | a805069c59586775fd5790c00cbd82f4dfeddcb6 (diff) | |
| parent | 8f5295f2d13e895490813c0ced19cfd738e591ac (diff) | |
| download | open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.gz open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.bz2 open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.zip | |
Merge branch 'master' into development
Diffstat (limited to 'extern/zxing-android-integration')
| m--------- | extern/zxing-android-integration | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration -Subproject 1d787845663fd232f98f5e8e0923733c1a188f2 +Subproject e2d0064bd3171b7333af044bb30c25c85ee993d |