summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-05 12:44:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-05 12:44:01 -0600
commitac9021ad9c3cadeffb80f8e7af91a6859d5a9e34 (patch)
tree34531e0491ba4c5ad0ef01c99b677b6b1d82e0b5
parentc1a5204bdd591cfef0b8bb9f9e3185f41264065e (diff)
parent95cdeff3835e7cf4090a8682c83cd04e8dc07c8c (diff)
downloadtde-ac9021ad9c3cadeffb80f8e7af91a6859d5a9e34.tar.gz
tde-ac9021ad9c3cadeffb80f8e7af91a6859d5a9e34.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
m---------main/tdeadmin0
m---------main/tdebase0
m---------main/tdelibs0
m---------main/tdepim0
4 files changed, 0 insertions, 0 deletions
diff --git a/main/tdeadmin b/main/tdeadmin
-Subproject 6f5d62f8e100b3b589166766562e7bafb1d42f2
+Subproject 8d0dc05b1ce1468a5b45e83074d5bf7bfbf2dd8
diff --git a/main/tdebase b/main/tdebase
-Subproject 0da9700bfe53d403abe2c08567081c1ce60f124
+Subproject 687b1460b969af4f942233605abcca3a9b3c7f2
diff --git a/main/tdelibs b/main/tdelibs
-Subproject 7b66a28f379f5838b67e55b4dbf7960fef2f5b8
+Subproject f0d26a3ab65a8b1641887c31d5ffb71c17730d2
diff --git a/main/tdepim b/main/tdepim
-Subproject a24c7ba4c8d11d4f5e2455a32ff3332d488aef0
+Subproject 96cf12b16ab69bcb2df0773091ba9751e921944