diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
| commit | 20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f (patch) | |
| tree | 258667acf6ea0c995b47195492d453c7459b31ca /extern | |
| parent | 92ac2ded10548756922a4c22ebae0a19b8862426 (diff) | |
| parent | 5c44f8400970de5943fd6c5e804dfa394f3deb01 (diff) | |
| download | open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.gz open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.bz2 open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.zip | |
Merge tag 'v3.2.1' into linked-identities
Version 3.2.1
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'extern')
| m--------- | extern/openkeychain-api-lib | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/snackbar | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib -Subproject 9259075028e0906d0cb085e0c4578e23829dc3c +Subproject 2a6cc7999f35c6e85e80ab6f98965d0e64974a9 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 70259ab74889fb5b785da0afc74259816f0b34b +Subproject 5a24bb3428e89d394861d71bd50b46d941d6c87 diff --git a/extern/snackbar b/extern/snackbar deleted file mode 160000 -Subproject 97cda0806d9ead9a3aacf3d4f7275ac0e38d960 |