Dominik Schürmann c0ebc92611 Merge branch 'master' into yubikey ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java

2014-08-28 11:00:18 +02:00

..

html-textview @ eedaa334e7

Update buildTools to 19.1

2014-06-09 21:55:32 +02:00

KeybaseLib @ 2e8f38f6e3

Update keybase lib

2014-08-20 09:20:30 +02:00

minidns @ dcf62a8ac5

Add minidns submodule

2014-06-23 21:46:17 +02:00

openkeychain-api-lib @ 02cb8ad24b

Update gradle plugin to 0.12.2

2014-07-27 18:28:54 +02:00

openpgp-api-lib @ 1d0eeef047

update api lib

2014-08-12 15:51:29 +02:00

openpgp-card-nfc-lib @ 1a0579e066

Support for multiple hash algos

2014-08-14 14:50:13 +02:00

spongycastle @ 526d23382e

update to tidy spongy-master

2014-08-23 11:59:21 +02:00

StickyListHeaders @ 911f8ddfd0

Fix sticky list headers lib, fix travis

2014-08-14 19:30:59 +02:00

SuperToasts @ 8578cfe691

Fix supertoast submodule

2014-06-28 20:24:02 +02:00

TokenAutoComplete @ 0056270cec

TokenAutoComplete: Do not abort build if lint finds errors

2014-08-04 02:37:41 +02:00

zxing-android-integration @ 1d78784566

Update buildTools to 19.1

2014-06-09 21:55:32 +02:00

zxing-qr-code @ 9ef2f3b66e

Update buildTools to 19.1

2014-06-09 21:55:32 +02:00