summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 23:22:43 -0600
committerTimothy Pearson <[email protected]>2013-02-15 23:22:43 -0600
commitbd1e64d4628c4e8a72e1e1b999c1f12627592b62 (patch)
tree8429f9959bfc12658fecfe3558e9809b18869f3d
parent71abba5631126445560d6ab309a51c28745a0b74 (diff)
parent26f0d31d331c130c3a526de121fb287a78451ce9 (diff)
downloadtdelibs-bd1e64d4628c4e8a72e1e1b999c1f12627592b62.tar.gz
tdelibs-bd1e64d4628c4e8a72e1e1b999c1f12627592b62.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
m---------admin0
m---------cmake0
2 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin
-Subproject 39466b7b95f25a3e0f6da52b156b194b10cbac9
+Subproject 50c595422f05af2f2e1457ee3d27f8e5ce1ab35
diff --git a/cmake b/cmake
-Subproject 274366fb8b90704586d7beef216b765cc0688b0
+Subproject 5438330f961347e3026326e78e0e70a1ec083aa