Merge branch 'master' into improve-file-more

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml

...

This commit is contained in:

mar-v-in

2014-07-06 02:24:34 +02:00

parent 1b0666e9de 3363507be4

commit fdf6411d5f

74 changed files with 11697 additions and 1929 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/spongycastle vendored

Submodule extern/spongycastle updated: 09d85b7d7a...968405ee5d