Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Christian Basler 2016-01-29 18:20:24 +01:00
commit 3103ae6edd

View File

@ -35,14 +35,14 @@ Unless you want to implement your own, also add the following:
```Gradle
compile 'ch.dissem.jabit:jabit-networking:1.0.0'
compile 'ch.dissem.jabit:jabit-repositories:1.0.0'
compile 'ch.dissem.jabit:jabit-cryptography-bc:1.0.0'
compile 'ch.dissem.jabit:jabit-cryptography-bouncy:1.0.0'
```
And if you want to import from or export to the Wallet Import Format (used by PyBitmessage) you might also want to add:
```Gradle
compile 'ch.dissem.jabit:jabit-wif:1.0.0'
```
For Android clients use `jabit-cryptography-sc` instead of `jabit-cryptography-bc`.
For Android clients use `jabit-cryptography-spongy` instead of `jabit-cryptography-bouncy`.
Usage
-----