Vincent Breitmoser c871891f49 Merge remote-tracking branch 'origin/master' ...

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

2014-09-24 01:42:17 +02:00

..

results

Yubikey text decryption working

2014-09-24 00:57:57 +02:00

ContactSyncAdapterService.java

package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting

2014-09-17 21:51:25 +02:00

DummyAccountService.java

Optimize imports

2014-08-05 22:46:00 +02:00

KeychainIntentService.java

Merge remote-tracking branch 'origin/master'

2014-09-24 01:42:17 +02:00

KeychainIntentServiceHandler.java

package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting

2014-09-17 21:51:25 +02:00

PassphraseCacheService.java

passphrasecache: cache by master key, introduce preference for cache by subkey

2014-09-23 15:56:48 +02:00

SaveKeyringParcel.java

Feature to change key configuration in create key

2014-09-21 21:50:56 +02:00