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 committed 2014-08-14 13:31:01 +02:00

2 parents 881a50207a 37edd0f390

commit 6da17ef6bb

116 files changed

+2406 -3259

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

No files matched your search

extern/openpgp-api-lib

Vendored

+1 -1

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

extern/spongycastle

Vendored

+1 -1

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