diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
| commit | b4aec3114d9911cf9aef0d14ee697e5131b2853f (patch) | |
| tree | 7237de5955ec34d8849737b2f9229bfbb37d0c45 /extern | |
| parent | c2163460971cc01e65d7dfd18eec491f01ebc744 (diff) | |
| parent | baac30508d24dcda6135bf8ae338c99d8c3b8ad8 (diff) | |
| download | open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.gz open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.bz2 open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.zip | |
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'extern')
| m--------- | extern/StickyListHeaders | 0 | ||||
| m--------- | extern/TokenAutoComplete | 0 | ||||
| m--------- | extern/html-textview | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/spongycastle | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders deleted file mode 160000 -Subproject 70a2ed80632938540bf07b81270384f4e5a96f9 diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete deleted file mode 160000 -Subproject 1d6d3882e711c14c93abf73cbcbd28b9e0e2b49 diff --git a/extern/html-textview b/extern/html-textview deleted file mode 160000 -Subproject 9872a73156518fd8df79dd2cd4d24750574b9ac diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 9abb91d3a69964a547f26aa1d56de233e75c441 +Subproject 70259ab74889fb5b785da0afc74259816f0b34b diff --git a/extern/spongycastle b/extern/spongycastle -Subproject 4bb0180faa920f4e8cf3d482976a34e4df982a8 +Subproject 2c744ebade816d2e4f65f3734db373e4c19c2e4 |