summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-13 20:36:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-13 20:36:15 -0600
commitceef24c48fa216c5322d559bc425dad71ff3dae4 (patch)
tree044c45f86a50182a473ea6eefda24fa0ccd69bfe /main
parent8847ccdec0d9fb3182e5dac18264bdf26b8a0a91 (diff)
parent8bb77eee4ae11844bb107fa45f304ae66937c90d (diff)
downloadtde-ceef24c48fa216c5322d559bc425dad71ff3dae4.tar.gz
tde-ceef24c48fa216c5322d559bc425dad71ff3dae4.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
Diffstat (limited to 'main')
m---------main/applications/bibletime0
m---------main/applications/kcmldap0
m---------main/applications/kcmldapcontroller0
m---------main/applications/kcmldapmanager0
4 files changed, 0 insertions, 0 deletions
diff --git a/main/applications/bibletime b/main/applications/bibletime
-Subproject 77c77a82c13d68cb09659adab1358b51612797b
+Subproject f5cace5bee4a362858b50ec6f6383f9e6aecf2d
diff --git a/main/applications/kcmldap b/main/applications/kcmldap
-Subproject a5859807124302fe87c7de5ab0f48aaaf478a03
+Subproject 6c2ad6e9689b6a8dc6a8f5a38be285f9e509758
diff --git a/main/applications/kcmldapcontroller b/main/applications/kcmldapcontroller
-Subproject ef8ca3571a8cbec52f11195dcbf6b0910087102
+Subproject 3f0f8ac65fd0f0807045744309327f170b9db39
diff --git a/main/applications/kcmldapmanager b/main/applications/kcmldapmanager
-Subproject 234e58296694b1c3069ef4898944aa6ab69f674
+Subproject 9169be38ae30a1867f6b2e246a2810a936b21b6