diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /extern | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'extern')
| m--------- | extern/TokenAutoComplete | 0 | ||||
| m--------- | extern/openkeychain-api-lib | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/openpgp-card-nfc-lib | 0 | ||||
| m--------- | extern/spongycastle | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete new file mode 160000 +Subproject 0056270cec6a91893b853844ebe99f6cd5c1534 diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib -Subproject 48941ca6ec58c4583cdcf9d647ad5174925e2f2 +Subproject 02cb8ad24b780f3b97073f2526f83057c99d424 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 869ab96e6dcd4821fd5360248429e49dae6fbac +Subproject fab79b605f0317891fe4260dcec0dea1a76fa04 diff --git a/extern/openpgp-card-nfc-lib b/extern/openpgp-card-nfc-lib -Subproject b293af0bd27739d4dcfe964819cf7eebddf1f2b +Subproject 1531e38c30a9c3e072e302c1931fef2999fe08d diff --git a/extern/spongycastle b/extern/spongycastle -Subproject a68ebd1ffc5af880903b2905c17e4f6ac0f1398 +Subproject 9e4fb80c4f8efb8a0f8fd0c1cc1e74a421d1eb7 |