Vincent Breitmoser 945764b30f Merge branch 'master' of github.com:open-keychain/open-keychain

2014-08-20 22:38:28 +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

Upload key working

2014-08-20 22:17:16 +02:00

pgp

make number of secret keys imported part of ImportResult parcel

2014-08-20 21:51:57 +02:00

provider

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

2014-08-20 22:38:28 +02:00

remote

return some more results

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

service

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

2014-08-20 22:38:28 +02:00

ui

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

2014-08-20 22:38:28 +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: prevent concurrent calls of step 2

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