diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 13:31:01 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 13:31:01 +0200 |
| commit | 6da17ef6bbe9569e53268b446e59dcc69aaa2da4 (patch) | |
| tree | 0747b0f06b974f032573f48c08930498050ab9ce /extern | |
| parent | 881a50207af0a9f9f5aa69f451110de786779b54 (diff) | |
| parent | 37edd0f390064e725d1b5c1c866a76c9922b0f64 (diff) | |
| download | open-keychain-6da17ef6bbe9569e53268b446e59dcc69aaa2da4.tar.gz open-keychain-6da17ef6bbe9569e53268b446e59dcc69aaa2da4.tar.bz2 open-keychain-6da17ef6bbe9569e53268b446e59dcc69aaa2da4.zip | |
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
Diffstat (limited to 'extern')
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/spongycastle | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject fab79b605f0317891fe4260dcec0dea1a76fa04 +Subproject 1d0eeef047c4938f4e25bc06f7e92e83aa46a4c diff --git a/extern/spongycastle b/extern/spongycastle -Subproject 9e4fb80c4f8efb8a0f8fd0c1cc1e74a421d1eb7 +Subproject 918340cbc6d5396764bfe94fdba07aca11cd816 |