aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-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 submodulemar-v-in2014-06-051-0/+3
| |
* | import-log: add SuperToast external libraryVincent Breitmoser2014-06-101-0/+3
|/
* Move API libs and API example into their own git reposDominik Schürmann2014-05-071-0/+6
|
* Use git submodules for libs, fix compilation, remove library sourcecodeDominik Schürmann2014-04-161-0/+21