aboutsummaryrefslogtreecommitdiffstats
path: root/extern/zxing-android-integration
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-05 00:23:15 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-05 00:23:15 +0200
commite9fccff8bce3648f8e9e6677d712723a98c0fd1a (patch)
tree3d78b4cad752a6380268d4d94e9b47c4e211e02d /extern/zxing-android-integration
parent80408460a0aa16c38dc5b3269061bac85306d24a (diff)
parentb617112c9bce576f37c3d3b14773b9d00a8c92ce (diff)
downloadopen-keychain-e9fccff8bce3648f8e9e6677d712723a98c0fd1a.tar.gz
open-keychain-e9fccff8bce3648f8e9e6677d712723a98c0fd1a.tar.bz2
open-keychain-e9fccff8bce3648f8e9e6677d712723a98c0fd1a.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'extern/zxing-android-integration')
0 files changed, 0 insertions, 0 deletions