diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-10 16:13:38 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-10 16:13:38 -0500 |
commit | b7ebe7a1c5c942dfdbca33fc233216833a9aa198 (patch) | |
tree | 3d68c0f67c3b1a42c14d1a2aa8ff92ea7ffa29d5 /main | |
parent | d03ef693f862f5a1bd7aba8a296eed8705f72c2d (diff) | |
parent | 0363ae53959ca8dbf81310550106a079945485e7 (diff) | |
download | tde-b7ebe7a1c5c942dfdbca33fc233216833a9aa198.tar.gz tde-b7ebe7a1c5c942dfdbca33fc233216833a9aa198.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
Diffstat (limited to 'main')
m--------- | main/tdeadmin | 0 | ||||
m--------- | main/tdebase | 0 | ||||
m--------- | main/tdenetwork | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/main/tdeadmin b/main/tdeadmin -Subproject 914e923d52314022b64ee792d60590489be318a +Subproject bd1f9bec80cd6fdab00d3ba951a54a205584ad6 diff --git a/main/tdebase b/main/tdebase -Subproject cc12a51c629cfaec41a6170a480ea0a757b26f5 +Subproject 0014712b085cecda712bbbdd31e618a1ada2a4e diff --git a/main/tdenetwork b/main/tdenetwork -Subproject fa1a997a1fb5dd3be69fc2e31c098247d512465 +Subproject 2cffbbcadc505c1dcdeab6cd16dfa21daf7816f |