aboutsummaryrefslogtreecommitdiffstats
path: root/extern/zxing-android-integration
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-30 19:48:27 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-30 19:48:27 +0100
commit8720a211067a5cd0a82311603865c283ca3ba4ac (patch)
treeac4a1d7c6902f7759db4bf20e8947be721025e22 /extern/zxing-android-integration
parent70175279993b60c2c06e0f3d7d7d1f8e4b914ad9 (diff)
parentf10ec9138021802dfae8145c33d144d6b3173593 (diff)
downloadopen-keychain-8720a211067a5cd0a82311603865c283ca3ba4ac.tar.gz
open-keychain-8720a211067a5cd0a82311603865c283ca3ba4ac.tar.bz2
open-keychain-8720a211067a5cd0a82311603865c283ca3ba4ac.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'extern/zxing-android-integration')
0 files changed, 0 insertions, 0 deletions