diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
| commit | c0ebc926117d3e444c7c32bf3251880852000df6 (patch) | |
| tree | b84926b3eee5cf1cfd6d38a2c3bec23e8f0b6779 /README.md | |
| parent | ad69e47cec58287d82978b28416db50f6c3feb77 (diff) | |
| parent | b193965e585d0d492cf2744e3c86ecc9e45b71d4 (diff) | |
| download | open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.gz open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.bz2 open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.zip | |
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -5,8 +5,6 @@ For a more detailed description and installation instructions go to http://www.o ### Travis CI Build Status -Currently, some tests could fail even when everything is okay! - [](https://travis-ci.org/open-keychain/open-keychain) ## How to help the project? @@ -107,6 +105,7 @@ see * Tests in https://github.com/bcgit/bc-java/tree/master/pg/src/test/java/org/bouncycastle/openpgp/test * Examples in https://github.com/bcgit/bc-java/tree/master/pg/src/main/java/org/bouncycastle/openpgp/examples * Mailinglist Archive at http://bouncy-castle.1462172.n4.nabble.com/Bouncy-Castle-Dev-f1462173.html +* Commit changelog of pg subpackage: https://github.com/bcgit/bc-java/commits/master/pg ## Notes |