diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-05 00:23:15 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-05 00:23:15 +0200 |
commit | e9fccff8bce3648f8e9e6677d712723a98c0fd1a (patch) | |
tree | 3d78b4cad752a6380268d4d94e9b47c4e211e02d /extern/zxing-android-integration | |
parent | 80408460a0aa16c38dc5b3269061bac85306d24a (diff) | |
parent | b617112c9bce576f37c3d3b14773b9d00a8c92ce (diff) | |
download | open-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