aboutsummaryrefslogtreecommitdiffstats
path: root/extern
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-07-06 02:24:34 +0200
committermar-v-in <github@rvin.mooo.com>2014-07-06 02:24:34 +0200
commitfdf6411d5f059a2cde6bb32841895d5bf501ebe8 (patch)
treede8f6434ad00dd2a688160204aa5762b49f14b99 /extern
parent1b0666e9de5caea14997a3e638a6209b45c97d60 (diff)
parent3363507be48e6ee77341fc8d637528610dc5136f (diff)
downloadopen-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.tar.gz
open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.tar.bz2
open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.zip
Merge branch 'master' into improve-file-more
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
Diffstat (limited to 'extern')
m---------extern/spongycastle0
1 files changed, 0 insertions, 0 deletions
diff --git a/extern/spongycastle b/extern/spongycastle
-Subproject 09d85b7d7a64b3003210d065c4210ff7fb7a8c6
+Subproject 968405ee5d4272330cffdf75f7eee4cd9f5c864