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

2014-08-01 11:09:25 +02:00

parent bef3e62111 acbf2a1861

commit e10cbc54c6

317 changed files with 5053 additions and 3006 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

extern/AppMsg

Vendored

-1

Submodule extern/AppMsg deleted from 61e7474190