mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml		2014-07-06 02:24:34 +02:00
..
src	Merge branch 'master' into improve-file-more	2014-07-06 02:24:34 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Many changes to file ... and still incomplete	2014-07-06 02:10:35 +02:00