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-qr-code | |
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-qr-code')
m--------- | extern/zxing-qr-code | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/extern/zxing-qr-code b/extern/zxing-qr-code -Subproject 50193905fd8cef92140ea242f77b04bb31391c9 +Subproject 9ef2f3b66ea7cc283e865ec39434d023a18d17f |