Tim Bray
|
17f43ad21b
|
Moved Keybase stuff into KeybaseLib submodule
|
2014-06-20 09:31:34 -07:00 |
|
Vincent Breitmoser
|
3bffe4da55
|
generate public keyring from secret if not available
|
2014-06-18 20:55:44 +02: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 |
|
Dominik Schürmann
|
fe1b8468a1
|
Update buildTools to 19.1
|
2014-06-09 21:55:32 +02:00 |
|
mar-v-in
|
36312b950a
|
Add dnsjava as submodule
|
2014-06-05 23:46:14 +02:00 |
|
Vincent Breitmoser
|
80779defb1
|
spongycastle: expose pskr constructor
|
2014-06-02 18:48:46 +02:00 |
|
Dominik Schürmann
|
638554f256
|
Update html-textview
|
2014-05-14 11:02:30 +02:00 |
|
Dominik Schürmann
|
be46eabdb5
|
Add pgpauth app to help, update html-textview
|
2014-05-13 18:52:48 +02:00 |
|
Dominik Schürmann
|
b4a9d1a2db
|
Add applications section to help
|
2014-05-07 18:31:31 +02:00 |
|
Dominik Schürmann
|
b817a0a2a8
|
Update submodules
|
2014-05-07 17:02:10 +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 |
|