aboutsummaryrefslogtreecommitdiffstats
path: root/libraries/zxing-android-integration
diff options
context:
space:
mode:
authorDaniel Hammann <github@honnel.de>2014-03-05 17:05:01 +0100
committerDaniel Hammann <github@honnel.de>2014-03-05 17:05:01 +0100
commitbc5f2a9305d6a043133dd89ef5e3e886f220885a (patch)
tree5b51eddfe447831acde7cd43eb83813e86ac3852 /libraries/zxing-android-integration
parent76876a57c216eff92b4f0417c9ca2e09663d451e (diff)
parenta1230bbe53d279b44038268d05d85f86ae0ff840 (diff)
downloadopen-keychain-bc5f2a9305d6a043133dd89ef5e3e886f220885a.tar.gz
open-keychain-bc5f2a9305d6a043133dd89ef5e3e886f220885a.tar.bz2
open-keychain-bc5f2a9305d6a043133dd89ef5e3e886f220885a.zip
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
Diffstat (limited to 'libraries/zxing-android-integration')
0 files changed, 0 insertions, 0 deletions