Merge branch 'master' into yubikey

Browse Source

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

...

This commit is contained in:

Dominik Schürmann

2014-08-28 11:00:18 +02:00

parent ad69e47cec b193965e58

commit c0ebc92611

171 changed files with 9435 additions and 2107 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

extern/KeybaseLib vendored

Submodule extern/KeybaseLib updated: e214906a52...2e8f38f6e3

2

extern/StickyListHeaders vendored

Submodule extern/StickyListHeaders updated: 706c0e4472...911f8ddfd0

2

extern/spongycastle vendored

Submodule extern/spongycastle updated: 918340cbc6...526d23382e