aboutsummaryrefslogtreecommitdiffstats
path: root/extern/zxing-android-integration
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-13 00:33:13 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-13 00:33:13 +0200
commit9d7779072995fb35c18a719f79c8465828b33ce3 (patch)
tree10ad0e6676454a435d45b7dc12d1fd9148aab6a0 /extern/zxing-android-integration
parent5ab0d76c696512ea0830f178df17bb23c38e9e6c (diff)
parentca4774fd622131581e7f700a12594ad6fe1263b1 (diff)
downloadopen-keychain-9d7779072995fb35c18a719f79c8465828b33ce3.tar.gz
open-keychain-9d7779072995fb35c18a719f79c8465828b33ce3.tar.bz2
open-keychain-9d7779072995fb35c18a719f79c8465828b33ce3.zip
Merge branch 'canonicalize'
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
-Subproject 34029d4dcac81ec06137a046a189dac608e76ef
+Subproject 1d787845663fd232f98f5e8e0923733c1a188f2