Vincent Breitmoser 8132b9ac74 Merge branch 'master' into ditch-appmsg ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java

2014-07-26 23:06:32 +02:00

..

AlgorithmNames.java

Optimize imports

2014-04-15 22:52:21 +02:00

Choice.java

Change license from ASLv2 to GPLv3 where possible

2014-04-08 11:59:35 +02:00

Highlighter.java

Add highlighting to keyserver/keybase search

2014-05-16 11:38:43 +02:00

InputData.java

Move logic classes for import into own sub-package

2014-05-06 22:29:57 +02:00

IntentIntegratorSupportV4.java

Move logic classes for import into own sub-package

2014-05-06 22:29:57 +02:00

IterableIterator.java

Change license from ASLv2 to GPLv3 where possible

2014-04-08 11:59:35 +02:00

Log.java

Update license header for 2014

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

Notify.java

use SuperToast instead of AppMsg in code, part 1

2014-07-07 17:34:41 +02:00

PositionAwareInputStream.java

Change license from ASLv2 to GPLv3 where possible

2014-04-08 11:59:35 +02:00

Primes.java

Change license from ASLv2 to GPLv3 where possible

2014-04-08 11:59:35 +02:00

PRNGFixes.java

Optimize imports

2014-04-15 22:52:21 +02:00

ProgressScaler.java

modifyKey: error out on integrity check fails

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

QrCodeUtils.java

Move logic classes for import into own sub-package

2014-05-06 22:29:57 +02:00