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
..
compatibility
keyimport	fix nullpointer ImportKeysListEntry (from pulltorefresh)	2014-09-23 19:02:08 +02:00
pgp	fix signatures produced by yubikey	2014-09-24 01:37:28 +02:00
provider	log "unspecified" flags differently	2014-09-22 17:02:53 +02:00
remote	Yubikey text decryption working	2014-09-24 00:57:57 +02:00
service	Merge remote-tracking branch 'origin/master'	2014-09-24 01:42:17 +02:00
ui	Merge remote-tracking branch 'origin/master'	2014-09-24 01:42:17 +02:00
util	passphrasecache: cache by master key, introduce preference for cache by subkey	2014-09-23 15:56:48 +02:00
Constants.java	passphrasecache: cache by master key, introduce preference for cache by subkey	2014-09-23 15:56:48 +02:00
KeychainApplication.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