Merge branch 'master' into yubikey

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java

...

This commit is contained in:

Dominik Schürmann

2014-08-14 13:31:01 +02:00

parent 881a50207a 37edd0f390

commit 6da17ef6bb

116 changed files with 2406 additions and 3259 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/openpgp-api-lib vendored

Submodule extern/openpgp-api-lib updated: fab79b605f...1d0eeef047

2

extern/spongycastle vendored

Submodule extern/spongycastle updated: 9e4fb80c4f...918340cbc6