summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2014-12-02 20:57:47 -0600
committerTimothy Pearson <[email protected]>2014-12-02 20:57:47 -0600
commit240e172faaf82ba3acaa4a8fdff986cd055a5c1d (patch)
tree10b310073d889551de4e71532d93a436b4f8e199 /main
parent9692e7149c765a89ce352212fa00a5e0a1adee3b (diff)
parentc05675cd1217b4c5ea8b01e8ddc56d603e95baf1 (diff)
downloadtde-240e172faaf82ba3acaa4a8fdff986cd055a5c1d.tar.gz
tde-240e172faaf82ba3acaa4a8fdff986cd055a5c1d.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
Diffstat (limited to 'main')
m---------main/applications/tde-style-qtcurve0
m---------main/infrastructure/website0
m---------main/tdepim0
3 files changed, 0 insertions, 0 deletions
diff --git a/main/applications/tde-style-qtcurve b/main/applications/tde-style-qtcurve
-Subproject a1093ee4e14448727fa256855c92ad6b2c750da
+Subproject 467c6631fa0735954efce00f3c5d268565dce28
diff --git a/main/infrastructure/website b/main/infrastructure/website
-Subproject 9fb634d504c7f934ea13e4a696f4b01e3b1c061
+Subproject 95872863d95264c7bcb358f945802c7d1f7370e
diff --git a/main/tdepim b/main/tdepim
-Subproject 7ebe6cf307c7dbaaed92721d1fb50deecee1a8a
+Subproject a24c7ba4c8d11d4f5e2455a32ff3332d488aef0