Vincent Breitmoser 29145e49c9 merge: different msg if nothing was merged

2014-07-15 19:17:08 +02:00

..

compatibility

Update license header for 2014

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

helper

Magic to find possible mails and names of device owner

2014-06-28 00:05:12 +02:00

keyimport

Move sks-keyservers.net CA into assets folder

2014-06-25 00:37:01 +02:00

pgp

merge: different msg if nothing was merged

2014-07-15 19:17:08 +02:00

provider

merge: different msg if nothing was merged

2014-07-15 19:17:08 +02:00

remote

Fix nullpointer in API, fix #693

2014-07-08 04:24:27 +02:00

service

merge: different msg if nothing was merged

2014-07-15 19:17:08 +02:00

ui

Merge remote-tracking branch 'origin/master' into external-test

2014-07-15 17:39:36 +02:00

util

modifyKey: error out on integrity check fails

2014-07-12 02:02:37 +02:00

Constants.java

Move sks-keyservers.net CA into assets folder

2014-06-25 00:37:01 +02:00

KeychainApplication.java

Move sks-keyservers.net CA into assets folder

2014-06-25 00:37:01 +02:00