mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml

2014-07-06 02:24:34 +02:00

..

AppMsg @ 61e7474190

Update buildTools to 19.1

2014-06-09 21:55:32 +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 @ 48941ca6ec

Update git submodules for android gradle plugin to 0.12.0

2014-06-28 20:17:27 +02:00

openpgp-api-lib @ aa9ecf871c

Update git submodules for android gradle plugin to 0.12.0

2014-06-28 20:17:27 +02:00

spongycastle @ 968405ee5d

Update spongycastle

2014-07-02 16:56:38 +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 @ 4239ef065b

Many changes to file ... and still incomplete

2014-07-06 02:10:35 +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