diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
| commit | d9c937bbe762736d9f0c45d5ba0083555c8da2e1 (patch) | |
| tree | e5cbd2300622e555283867f39767bf34b9dd5796 /extern/zxing-android-integration | |
| parent | e106079b90f7d596a254b223b6e8741fc6d94785 (diff) | |
| parent | 825f37eee4be6a4dc527391e6238668e6d147a36 (diff) | |
| download | open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.gz open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.bz2 open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.zip | |
Merge branch 'master' into improve-file
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 34029d4dcac81ec06137a046a189dac608e76ef +Subproject 1d787845663fd232f98f5e8e0923733c1a188f2 |