Dominik Schürmann 6da17ef6bb Merge branch 'master' into yubikey ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java		2014-08-14 13:31:01 +02:00
..
html-textview@eedaa334e7	Update buildTools to 19.1	2014-06-09 21:55:32 +02:00
KeybaseLib@e214906a52	Update keybase lib	2014-06-28 20:44:01 +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@1531e38c30	Merge branch 'master' into yubikey	2014-08-06 01:08:12 +02:00
spongycastle@918340cbc6	Dont write version header by default	2014-08-14 11:44:47 +02:00
StickyListHeaders@706c0e4472	Update buildTools to 19.1	2014-06-09 21:55:32 +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