diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:19:01 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:19:01 +0200 |
| commit | eae7c711a3f588a24ef621a8b82bcd793bcb7e70 (patch) | |
| tree | 6c1017380b9234a193cfc6c6460ebfd44923837d /extern | |
| parent | 0c7eea225b7c04549e92c8c7729bf0e7a04aa5c7 (diff) | |
| parent | 50aea621ba4de844cf6eee077d1f5b14d0247f14 (diff) | |
| download | open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.tar.gz open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.tar.bz2 open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
Diffstat (limited to 'extern')
| m--------- | extern/AppMsg | 0 | ||||
| m--------- | extern/openkeychain-api-lib | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/spongycastle | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/extern/AppMsg b/extern/AppMsg deleted file mode 160000 -Subproject 61e74741909a712db2e0d31ddffa5b7cf37c21f 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 aa9ecf871ce4db462034662675b258f9839d3f6 +Subproject e515a49027fc5de36b8977cf8b096afc9838a9b diff --git a/extern/spongycastle b/extern/spongycastle -Subproject 968405ee5d4272330cffdf75f7eee4cd9f5c864 +Subproject 9e4fb80c4f8efb8a0f8fd0c1cc1e74a421d1eb7 |