summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-10-08 18:38:33 +0900
committerMichele Calgaro <[email protected]>2014-10-08 18:38:33 +0900
commitdad3b4ecb90f94d77a6a4af3d6ade44e7d4b7439 (patch)
treede73a42fe99cbbff808fb66dd5f23a61604867c5
parent08d236ca7af5e392542e608ae6b42015f471a261 (diff)
parent2c7bd0696d60e1188a8eed58462869a8a9e5f127 (diff)
downloadtde-dad3b4ecb90f94d77a6a4af3d6ade44e7d4b7439.tar.gz
tde-dad3b4ecb90f94d77a6a4af3d6ade44e7d4b7439.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
m---------main/tdebase0
m---------main/tdelibs0
2 files changed, 0 insertions, 0 deletions
diff --git a/main/tdebase b/main/tdebase
-Subproject 4724b1a838bf20c85309d8812c1a0bd23bbf2f9
+Subproject f4dab230c4d9f9e2aca86df98d2ee7398f9988a
diff --git a/main/tdelibs b/main/tdelibs
-Subproject c359057caabdb7740b46f0e45eafaa38d4f40d5
+Subproject a44c9249300c96da86fa79cae17bd88789e7539