diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-10 17:36:02 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-10 17:36:02 +0100 |
commit | da6dfb57a0aa816919cd23752e1707ba6a2e8cae (patch) | |
tree | d6ede03785491d4c56b10cad9062b8bcac3ea78b /settings.gradle | |
parent | 01b165ea88a032f31b8c2ff07351d3f893f6413d (diff) | |
parent | 751298a4d832f316244fd6345c46ba806dcfc860 (diff) | |
download | open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.tar.gz open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.tar.bz2 open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.zip |
Merge branch 'master' into performance
Diffstat (limited to 'settings.gradle')
-rw-r--r-- | settings.gradle | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/settings.gradle b/settings.gradle index dfcf1cabf..2d8a34da7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ include ':OpenKeychain' include ':extern:openpgp-api-lib:openpgp-api' include ':extern:openkeychain-api-lib:openkeychain-intents' -include ':extern:spongycastle:core' -include ':extern:spongycastle:pg' -include ':extern:spongycastle:prov' +include ':extern:bouncycastle:core' +include ':extern:bouncycastle:pg' +include ':extern:bouncycastle:prov' include ':extern:minidns' include ':extern:KeybaseLib:Lib' include ':extern:safeslinger-exchange:safeslinger-exchange' |