summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-13 23:35:37 -0600
committerTimothy Pearson <[email protected]>2013-02-13 23:35:37 -0600
commite8a681ba4b7558650e3b957b07caafc4b86c7a57 (patch)
treedecd9603fd11cd3089355f10f0052dfe1fcc9273 /main
parentca3995e158a3882c06d634fe695965a77d889aab (diff)
parente97e28860809f405ebc9030e61a329e617d57cb6 (diff)
downloadtde-e8a681ba4b7558650e3b957b07caafc4b86c7a57.tar.gz
tde-e8a681ba4b7558650e3b957b07caafc4b86c7a57.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
Diffstat (limited to 'main')
m---------main/dependencies/qt30
m---------main/libraries/libtdeldap0
2 files changed, 0 insertions, 0 deletions
diff --git a/main/dependencies/qt3 b/main/dependencies/qt3
-Subproject 5aa389f311cae593530b0d0f500d67b10f7dd49
+Subproject c47f5e14e4231c872828374d05815d59a045cb2
diff --git a/main/libraries/libtdeldap b/main/libraries/libtdeldap
-Subproject a3118cb55bc12866b608441b7719c529206cfc4
+Subproject 20c48849ea570d4d264e83bf8a9fb52e7fcbde2