mar-v-in eae7c711a3 Merge branch 'master' into improve-file-more ... Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java		2014-07-31 23:19: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@e515a49027	Update gradle plugin to 0.12.2	2014-07-27 18:28:54 +02:00
spongycastle@9e4fb80c4f	Update spongycastle	2014-07-27 18:21:39 +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