Vincent Breitmoser b779211f55 Merge branch 'master' into v/multi-decrypt ...

this also fixes weird-bug

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
	OpenKeychain/src/main/res/values/strings.xml

2015-06-06 23:40:22 +02:00

..

compatibility

Update license header for 2014

2014-04-13 17:27:22 +02:00

keyimport

Cleanup in HkpKeyserver

2015-04-20 13:53:00 +02:00

operations

Merge branch 'master' into v/multi-decrypt

2015-06-06 23:40:22 +02:00

pgp

multi-decrypt: working in principle

2015-06-02 22:19:28 +02:00

provider

multi-decrypt: implement save operation (missing actual copy)

2015-06-03 17:01:29 +02:00

remote

some decrypt/verify bug fixes

2015-05-30 13:52:56 +02:00

service

Merge branch 'master' into v/multi-decrypt

2015-06-06 23:40:22 +02:00

ui

Merge branch 'master' into v/multi-decrypt

2015-06-06 23:40:22 +02:00

util

Merge branch 'v/sticky-prefs'

2015-06-03 01:23:51 +02:00

Constants.java

keep prefernces individual per dialog (affects only compression)

2015-06-03 01:21:06 +02:00

KeychainApplication.java

revert unneeded changes for old temp Bluetooth share file

2015-05-04 17:15:10 -04:00