aboutsummaryrefslogtreecommitdiffstats
path: root/extern/zxing-android-integration
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-03-02 22:31:13 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-03-02 22:31:13 +0530
commitc2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236 (patch)
tree169ad00d1a1e5d1249144de3b0474f7fb2de7fd7 /extern/zxing-android-integration
parente69ee812d2a73ef6d4a1c2df3e180bb61fa050e3 (diff)
parent7127c2205e6e0f671388a04785b1e7879c536c64 (diff)
downloadopen-keychain-c2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236.tar.gz
open-keychain-c2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236.tar.bz2
open-keychain-c2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236.zip
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
Diffstat (limited to 'extern/zxing-android-integration')
m---------extern/zxing-android-integration0
1 files changed, 0 insertions, 0 deletions
diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration
deleted file mode 160000
-Subproject e2d0064bd3171b7333af044bb30c25c85ee993d