Dominik Schürmann
d8ada7c1bb
Merge branch 'master' into yubikey
...
Conflicts:
.gitmodules
2014-07-18 09:47:24 +02:00
Dominik Schürmann
306bea5ee9
Removed OpenPGP-haskell submodule
2014-07-18 09:39:36 +02:00
Dominik Schürmann
e531da4036
Add nfc lib
2014-07-16 10:22:51 +02:00
Vincent Breitmoser
718acbf954
put unit tests into external module (CAVEAT)
...
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
2014-07-09 16:03:30 +02:00
Dominik Schürmann
9c1c51bf0c
Removed submodule AndroidBootstrap
2014-06-30 22:04:13 +02:00
Dominik Schürmann
b34c744324
Change keybase submodule to our fork
2014-06-28 18:56:19 +02:00
Dominik Schürmann
9ce7d29a2d
Merge submodules
2014-06-24 20:16:46 +02:00
mar-v-in
6c42fe58bd
Add minidns submodule
2014-06-23 21:46:17 +02:00
mar-v-in
2cd4f7eb93
Remove dnsjava module
2014-06-23 21:44:49 +02:00
Art O Cathain
109f74a922
https for submodules
2014-06-23 17:54:27 +01:00
Art O Cathain
a5d85b367d
add OpenPGP-Haskell to test collateral
2014-06-23 17:54:27 +01:00
Tim Bray
17f43ad21b
Moved Keybase stuff into KeybaseLib submodule
2014-06-20 09:31:34 -07:00
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
Vincent Breitmoser
97c679ada3
import-log: add SuperToast external library
2014-06-10 01:24:58 +02:00
mar-v-in
36312b950a
Add dnsjava as submodule
2014-06-05 23:46:14 +02:00
Dominik Schürmann
ab1b2df2d6
Move API libs and API example into their own git repos
2014-05-07 16:51:06 +02:00
Dominik Schürmann
f7c243564f
Use git submodules for libs, fix compilation, remove library sourcecode
2014-04-16 21:49:29 +02:00
