diff options
| author | Timothy Pearson <[email protected]> | 2015-02-17 17:35:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2015-02-17 17:35:22 -0600 |
| commit | 831177bc5904031eab8b3617f78fdcc41c694512 (patch) | |
| tree | 211a7f8f5e38e5b982c850e3e136c492a7e3e6fb | |
| parent | 959e77d110ecd0b98623bc41ec9071a26d4610e1 (diff) | |
| parent | 1d6164f6908bd3beca21ee32ffae2ae4d30c87d8 (diff) | |
| download | tde-831177bc5904031eab8b3617f78fdcc41c694512.tar.gz tde-831177bc5904031eab8b3617f78fdcc41c694512.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | main/dependencies/libr | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 7e2b4097f..b66a4b77f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -283,6 +283,9 @@ [submodule "main/applications/kerry"] path = main/applications/kerry url = https://[email protected]/scm/git/kerry +[submodule "main/applications/keximdb"] + path = main/applications/keximdb + url = http://[email protected]/scm/git/keximdb [submodule "main/applications/kftpgrabber"] path = main/applications/kftpgrabber url = https://[email protected]/scm/git/kftpgrabber @@ -499,6 +502,3 @@ [submodule "main/thirdparty"] path = main/thirdparty url = https://[email protected]/scm/git/thirdparty -[submodule "main/applications/keximdb"] - path = main/applications/keximdb - url = http://[email protected]/scm/git/keximdb diff --git a/main/dependencies/libr b/main/dependencies/libr -Subproject b9ad6f1e954a68640d01176e597af03ec9281e3 +Subproject 39b1fe26983424f098328180ad353a08ede2e3a |