Merge branch 'master' into yubikey

Browse Source

Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java

...

This commit is contained in:

Dominik Schürmann committed 2014-08-01 11:09:25 +02:00

2 parents bef3e62111 acbf2a1861

commit e10cbc54c6

317 files changed

+5053 -3006

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/AppMsg

Vendored

-1

Submodule extern/AppMsg deleted from 61e7474190.