diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
| commit | 2f83291920e024b0f8038fe0caa747051b41cf1c (patch) | |
| tree | 780fc0975e56b3dbd8a1eb4cb2988ac3e2e23ea1 /extern | |
| parent | aa22a0defcf94d5f734d3a00288f5c8d916d2e57 (diff) | |
| parent | 4e29d027af05fc574dc5398d2fb3afcdf3defc70 (diff) | |
| download | open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.gz open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.bz2 open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.zip | |
NON-WORKING Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
extern/spongycastle
Diffstat (limited to 'extern')
| m--------- | extern/android-lockpattern | 0 | ||||
| m--------- | extern/minidns | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/safeslinger-exchange | 0 | ||||
| m--------- | extern/spongycastle | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/extern/android-lockpattern b/extern/android-lockpattern deleted file mode 160000 -Subproject b9fcb13dcaa978c6d7be2c82cf3d11a233d5973 diff --git a/extern/minidns b/extern/minidns -Subproject f3a19080f15e220fbacab5045c1f15fd12513b3 +Subproject 969ffd2951fcaa07f46b441936a0c0fd4502daf diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 89b0a3bd140dd178595c031beaa27747575d7ac +Subproject c866dc22bcfa004ec2c46bc86c08694e76d1058 diff --git a/extern/safeslinger-exchange b/extern/safeslinger-exchange -Subproject 80beccbe1b95437040b201a37f40cdb50053c06 +Subproject 96f7c893565e3a8badd740b2035beea87d8bffb diff --git a/extern/spongycastle b/extern/spongycastle -Subproject f13d9c202f7470ede75f2c02cc8c578acd3acee +Subproject 939914d9ffd1e8cc2710de6c600c9ccfc86aa54 |