moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity
ffea551afc
open-keychain/extern
History
Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
2014-06-13 00:27:40 +02:00
..
AndroidBootstrap@02f02391e3 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
AppMsg@61e7474190 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
dnsjava@71c8a9e56b Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
html-textview@eedaa334e7 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
openkeychain-api-lib@175a3cb772 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
openpgp-api-lib@a77887d32f Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
spongycastle@2c47e5fca2 spongycastle: expose pskr constructor 2014-06-02 18:48:46 +02:00
StickyListHeaders@706c0e4472 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
SuperToasts@8578cfe691 Merge remote-tracking branch 'origin/master' into canonicalize 2014-06-13 00:27:40 +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