Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |