Merge branch 'ditch-appmsg'

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java

...

This commit is contained in:

Vincent Breitmoser

2014-07-29 13:53:18 +02:00

parent da131220aa f4ee71e3ef

commit 377d0f09fa

40 changed files with 309 additions and 1005 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

1

extern/AppMsg vendored

Submodule extern/AppMsg deleted from 61e7474190