summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-10-02 14:24:34 +0900
committerMichele Calgaro <[email protected]>2014-10-02 14:24:34 +0900
commit07c0b95888aa827e6a68ee7770be958f210aec27 (patch)
tree81d380fa6e62b074733132a7ff6b022d3929615e /main
parent7437d0b206a15417bb4f4601e1314f7c59b75087 (diff)
parent6573fa227a9936ef60de4dbba0f3dd3b6d040d88 (diff)
downloadtde-07c0b95888aa827e6a68ee7770be958f210aec27.tar.gz
tde-07c0b95888aa827e6a68ee7770be958f210aec27.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
Diffstat (limited to 'main')
m---------main/tdelibs0
m---------main/tdemultimedia0
2 files changed, 0 insertions, 0 deletions
diff --git a/main/tdelibs b/main/tdelibs
-Subproject 6d268f3c559ac6351666de4a362a0536ecc7c78
+Subproject 09a4688659beb1f585cbd8d59b57eb75b9c1fab
diff --git a/main/tdemultimedia b/main/tdemultimedia
-Subproject 68cff160cbf2fb0b4865f2b74bb49b8fa1a2a65
+Subproject 0ecfaa944652fa9b7a632e6135741c4b9f473a2