diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:57:21 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-13 00:27:40 +0200 |
| commit | ca4774fd622131581e7f700a12594ad6fe1263b1 (patch) | |
| tree | 10ad0e6676454a435d45b7dc12d1fd9148aab6a0 /extern | |
| parent | 073433fa747d698c6666081b2ee312062ecf2115 (diff) | |
| parent | 70d454785fc87dfaf8731a6eb7cebe3fc0056e7a (diff) | |
| download | open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.gz open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.bz2 open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.zip | |
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
Diffstat (limited to 'extern')
| m--------- | extern/AndroidBootstrap | 0 | ||||
| m--------- | extern/AppMsg | 0 | ||||
| m--------- | extern/StickyListHeaders | 0 | ||||
| m--------- | extern/SuperToasts | 0 | ||||
| m--------- | extern/dnsjava | 0 | ||||
| m--------- | extern/html-textview | 0 | ||||
| m--------- | extern/openkeychain-api-lib | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/zxing-android-integration | 0 | ||||
| m--------- | extern/zxing-qr-code | 0 |
10 files changed, 0 insertions, 0 deletions
diff --git a/extern/AndroidBootstrap b/extern/AndroidBootstrap -Subproject bfa160c4ef3a1a53aebd68aca9c05b8e546219e +Subproject 02f02391e3eee9331e07d7690d3b533a8b0f69e diff --git a/extern/AppMsg b/extern/AppMsg -Subproject ca714df97bfce67a7a9a1efefd2c49645b6f22e +Subproject 61e74741909a712db2e0d31ddffa5b7cf37c21f diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders -Subproject efe46c21143cc54a2394303a67822f14580d1d2 +Subproject 706c0e447229226b6edc82ab10630d39fd0f6c3 diff --git a/extern/SuperToasts b/extern/SuperToasts -Subproject e93d50cbf06e4dd7d61d33b6435eb3e7a75a152 +Subproject 8578cfe6917cf16a9f123c1964e4bbff2a15be5 diff --git a/extern/dnsjava b/extern/dnsjava new file mode 160000 +Subproject 71c8a9e56b19b34907e7e2e810ca15b57e3edc2 diff --git a/extern/html-textview b/extern/html-textview -Subproject c31ef2aff4282ad00af98e879e3e0a6000885b5 +Subproject eedaa334e761273efbfc49ded2124df58c8a4d8 diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib -Subproject 26497acb27e9f6349c0557b15cd24a5b0b735e7 +Subproject 175a3cb772c88c9b50985abc98f81c9ea69c365 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 650e1ebda82596cd4fbfaae406e6eccf189f4f6 +Subproject a77887d32fae68171fcd0d2989bf537c0c11f0b diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration -Subproject 34029d4dcac81ec06137a046a189dac608e76ef +Subproject 1d787845663fd232f98f5e8e0923733c1a188f2 diff --git a/extern/zxing-qr-code b/extern/zxing-qr-code -Subproject 50193905fd8cef92140ea242f77b04bb31391c9 +Subproject 9ef2f3b66ea7cc283e865ec39434d023a18d17f |