moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-07 11:38:11 -05:00
Code Issues Releases Wiki Activity
0bfac9989f
open-keychain/extern
History
Dominik Schürmann e10cbc54c6 Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
2014-08-01 11:09:25 +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 gradle plugin to 0.12.2 2014-07-27 18:28:54 +02:00
openpgp-api-lib@869ab96e6d Update gradle plugin to 0.12.2 2014-07-27 18:28:54 +02:00
openpgp-card-nfc-lib@b293af0bd2 update lib 2014-07-22 18:30:21 +02:00
spongycastle@a68ebd1ffc 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
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