Merge branch 'master' into ditch-appmsg

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java

...

This commit is contained in:

Vincent Breitmoser committed 2014-07-26 23:06:32 +02:00

2 parents d8f2782293 45722d7cfb

commit 8132b9ac74

174 files changed

+5350 -1267

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: aa9ecf871c...869ab96e6d.

extern/spongycastle

Vendored

+1 -1

Submodule extern/spongycastle updated: 968405ee5d...41ef8b1f53.