summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-03 15:54:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-03 15:54:50 -0600
commitc1a5204bdd591cfef0b8bb9f9e3185f41264065e (patch)
tree5c0a0fd2746e7dad4a4f63ee82546099d805ba2d /main
parent240e172faaf82ba3acaa4a8fdff986cd055a5c1d (diff)
parent1fc92750f480291058261801600028dfd89b7247 (diff)
downloadtde-c1a5204bdd591cfef0b8bb9f9e3185f41264065e.tar.gz
tde-c1a5204bdd591cfef0b8bb9f9e3185f41264065e.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
Diffstat (limited to 'main')
m---------main/tdeadmin0
m---------main/tdebase0
m---------main/tdeutils0
3 files changed, 0 insertions, 0 deletions
diff --git a/main/tdeadmin b/main/tdeadmin
-Subproject f4b45f46b8534bf14e6a4bc20d5000fd3ef6a2f
+Subproject 6f5d62f8e100b3b589166766562e7bafb1d42f2
diff --git a/main/tdebase b/main/tdebase
-Subproject ff6fa6e087f84bcc2e79bec4e5e2ac178a21023
+Subproject 0da9700bfe53d403abe2c08567081c1ce60f124
diff --git a/main/tdeutils b/main/tdeutils
-Subproject 802d972484023b0e1cbca59dbe1274f491f3d75
+Subproject 7a558b2be677407d644b0b3db8150cd042bf933