Vincent Breitmoser 69f5bf6b57 Merge branch 'unified-keylist' ...

Conflicts:
	OpenPGP-Keychain/src/main/AndroidManifest.xml
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
	OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
	OpenPGP-Keychain/src/main/res/menu/key_list.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml

2014-03-12 18:05:28 +01:00

..

compatibility

removed useless semicolons, fixed some parameters in documenation, simplified some conditionals

2014-03-07 22:35:49 +02:00

helper

Add Email suggestions in Create Key activity

2014-03-12 02:04:04 +02:00

pgp

fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions

2014-03-11 23:42:45 +02:00

provider

Merge branch 'unified-keylist'

2014-03-12 18:05:28 +01:00

service

fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions

2014-03-11 23:42:45 +02:00

ui

Merge branch 'unified-keylist'

2014-03-12 18:05:28 +01:00

util

Fix error in importing/updating keys from keyserver by removing extra 0x

2014-03-12 20:14:56 +05:30

Constants.java

Add export... button and functionality in multi-select

2014-03-11 03:53:00 +02:00

Id.java

corrected commit

2014-03-07 00:43:09 +05:30

KeychainApplication.java

New Gradle project structure

2014-01-27 14:18:25 +01:00