open-keychain/OpenKeychain/src/main
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
..
assets remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
java Merge branch 'master' into yubikey 2014-08-01 11:09:25 +02:00
res Merge branch 'master' into yubikey 2014-08-01 11:09:25 +02:00
AndroidManifest.xml More file association hacks for AndroidManifest and key import 2014-07-31 16:15:36 +02:00