moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity
8132b9ac74
open-keychain/extern
History
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
..
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@869ab96e6d Update libs 2014-07-25 01:34:57 +02:00
spongycastle@41ef8b1f53 fixes for extractPublicKeyRing, update SpongyCastle 2014-07-26 03:56:28 +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
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