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 /README.md | |
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 'README.md')
-rw-r--r-- | README.md | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -71,13 +71,10 @@ We are using the newest [Android Studio](http://developer.android.com/sdk/instal ### Bouncy Castle -#### Spongy Castle - -Spongy Castle is the stock Bouncy Castle libraries with a couple of small changes to make it work on Android. OpenKeychain uses a forked version with some small changes. These changes will been sent to Bouncy Castle, and Spongy Castle will be used again when they have filtered down. +OpenKeychain uses a forked version with some small changes. These changes will been sent to Bouncy Castle. see -* Fork: https://github.com/openpgp-keychain/spongycastle -* Spongy Castle: http://rtyley.github.com/spongycastle/ +* Fork: https://github.com/openpgp-keychain/bouncycastle #### Bouncy Castle resources |