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

..

assets

remove leftover of AndroidBootstrap

2014-06-30 22:05:02 +02:00

java

Merge branch 'master' into improve-file-more

2014-07-06 02:24:34 +02:00

res

Merge branch 'master' into improve-file-more

2014-07-06 02:24:34 +02:00

AndroidManifest.xml

Merge branch 'master' into improve-file-more

2014-07-06 02:24:34 +02:00