Dominik Schürmann 0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

2014-08-20 19:48:19 +02:00

..

compatibility

Update license header for 2014

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

helper

consolidate: a lot more log output, better recovery

2014-08-19 16:53:55 +02:00

keyimport

Optimize imports

2014-08-05 22:46:00 +02:00

pgp

Scroll fixes for certify activity

2014-08-19 16:31:51 +02:00

provider

consolidate: implement (mostly) recovery mode

2014-08-20 19:34:36 +02:00

remote

Fixes and temporary fixes for returning results

2014-08-20 19:46:44 +02:00

service

Merge branch 'master' of github.com:open-keychain/open-keychain

2014-08-20 19:48:19 +02:00

ui

Merge branch 'master' of github.com:open-keychain/open-keychain

2014-08-20 19:48:19 +02:00

util

add ProgressFixedScaler (forgot in a previous commit)

2014-08-19 15:55:53 +02:00

Constants.java

consolidate: split into two steps, can pick up at second step if anything fails

2014-08-19 15:45:59 +02:00

KeychainApplication.java

consolidate: use KeychainProvider for deletion operation

2014-08-20 19:31:51 +02:00