open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper
Dominik Schürmann e10cbc54c6 Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
2014-08-01 11:09:25 +02:00
..
ActionBarHelper.java
ContactHelper.java Magic to find possible mails and names of device owner 2014-06-28 00:05:12 +02:00
EmailKeyHelper.java
ExportHelper.java
FileHelper.java
OtherHelper.java
Preferences.java Merge branch 'master' into yubikey 2014-08-01 11:09:25 +02:00
TlsHelper.java