diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
| commit | c0ebc926117d3e444c7c32bf3251880852000df6 (patch) | |
| tree | b84926b3eee5cf1cfd6d38a2c3bec23e8f0b6779 /extern | |
| parent | ad69e47cec58287d82978b28416db50f6c3feb77 (diff) | |
| parent | b193965e585d0d492cf2744e3c86ecc9e45b71d4 (diff) | |
| download | open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.gz open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.bz2 open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.zip | |
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'extern')
| m--------- | extern/KeybaseLib | 0 | ||||
| m--------- | extern/StickyListHeaders | 0 | ||||
| m--------- | extern/spongycastle | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/extern/KeybaseLib b/extern/KeybaseLib -Subproject e214906a52233bb6f230bc6759ac7be803d24bf +Subproject 2e8f38f6e38fe77b828826d3c6e8cb89a8a9aee diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders -Subproject 706c0e447229226b6edc82ab10630d39fd0f6c3 +Subproject 911f8ddfd007ce65aededae7e7b79e5a8d903a4 diff --git a/extern/spongycastle b/extern/spongycastle -Subproject 918340cbc6d5396764bfe94fdba07aca11cd816 +Subproject 526d23382e53ce46a17a5efd9c23d884125e32c |