Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -3/+0 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| * | Removed OpenPGP-haskell submodule | Dominik Schürmann | 2014-07-18 | 1 | -4/+1 |
| | | |||||
| * | put unit tests into external module (CAVEAT) | Vincent Breitmoser | 2014-07-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | 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. | ||||
* | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -3/+0 |
|/ | |||||
* | Removed submodule AndroidBootstrap | Dominik Schürmann | 2014-06-30 | 1 | -3/+0 |
| | |||||
* | Change keybase submodule to our fork | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 |
| | |||||
* | Merge submodules | Dominik Schürmann | 2014-06-24 | 1 | -0/+3 |
|\ | |||||
| * | https for submodules | Art O Cathain | 2014-06-23 | 1 | -1/+1 |
| | | |||||
| * | add OpenPGP-Haskell to test collateral | Art O Cathain | 2014-06-23 | 1 | -0/+3 |
| | | |||||
* | | Add minidns submodule | mar-v-in | 2014-06-23 | 1 | -0/+3 |
| | | |||||
* | | Remove dnsjava module | mar-v-in | 2014-06-23 | 1 | -3/+0 |
|/ | |||||
* | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -0/+3 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -0/+3 |
|\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Add dnsjava as submodule | mar-v-in | 2014-06-05 | 1 | -0/+3 |
| | | |||||
* | | import-log: add SuperToast external library | Vincent Breitmoser | 2014-06-10 | 1 | -0/+3 |
|/ | |||||
* | Move API libs and API example into their own git repos | Dominik Schürmann | 2014-05-07 | 1 | -0/+6 |
| | |||||
* | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 1 | -0/+21 |