diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
| commit | d1d414c006aa6b7b80b25b34f0c75a92a9603a85 (patch) | |
| tree | 6375bd8a5436c866824190318d10d183d8548ab6 /extern | |
| parent | 38823b73a31ae0fb82d7e385c141f1170127c4dd (diff) | |
| parent | a9010045889d307ede37d154b0a2fece566c1845 (diff) | |
| download | open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.gz open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.bz2 open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
Diffstat (limited to 'extern')
| m--------- | extern/AndroidBootstrap | 0 | ||||
| m--------- | extern/KeybaseLib | 0 | ||||
| m--------- | extern/openkeychain-api-lib | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/extern/AndroidBootstrap b/extern/AndroidBootstrap deleted file mode 160000 -Subproject 02f02391e3eee9331e07d7690d3b533a8b0f69e diff --git a/extern/KeybaseLib b/extern/KeybaseLib -Subproject 838800d2cb57fdd4caca1bdbd919e9d96dae13e +Subproject e214906a52233bb6f230bc6759ac7be803d24bf diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib -Subproject 175a3cb772c88c9b50985abc98f81c9ea69c365 +Subproject 48941ca6ec58c4583cdcf9d647ad5174925e2f2 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 289d48b633b7493f2a760583c88670b9fc4ef96 +Subproject aa9ecf871ce4db462034662675b258f9839d3f6 |