summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-25 13:43:55 -0600
committerTimothy Pearson <[email protected]>2013-02-25 13:43:55 -0600
commit84cba689c93fffe65159728cc05f470b825250ff (patch)
tree379c0130c1760ac9bad1bd2fe8ab71e0c6b335d5 /main
parenta3d46aac662a389df0aeaf5aac4bf5cd70826be1 (diff)
parent571f934a41bbca1e18c79edea62231ce74673189 (diff)
downloadtde-84cba689c93fffe65159728cc05f470b825250ff.tar.gz
tde-84cba689c93fffe65159728cc05f470b825250ff.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde
Diffstat (limited to 'main')
m---------main/applications/rosegarden0
m---------main/libraries/kipi-plugins0
2 files changed, 0 insertions, 0 deletions
diff --git a/main/applications/rosegarden b/main/applications/rosegarden
-Subproject ff3e928c55566c49d42c1a72ce78bfd427fc3fe
+Subproject 32fc4ccb6fb88c8cb8de7f982e0f181a612cd12
diff --git a/main/libraries/kipi-plugins b/main/libraries/kipi-plugins
-Subproject 7f4828d709eff54d4d0538cb24a219cbb95d86f
+Subproject d8d472c6be61262172ee67a80d50dfdae640012