Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde

12 years ago · 84cba689c9
parent a3d46aac66 571f934a41
commit 84cba689c9
2 changed files with 2 additions and 2 deletions
--- a/main/applications/rosegarden
+++ b/main/applications/rosegarden
@ -1 +1 @@
-Subproject commit ff3e928c55566c49d42c1a72ce78bfd427fc3fe0
+Subproject commit 32fc4ccb6fb88c8cb8de7f982e0f181a612cd126
--- a/main/libraries/kipi-plugins
+++ b/main/libraries/kipi-plugins
@ -1 +1 @@
-Subproject commit 7f4828d709eff54d4d0538cb24a219cbb95d86fa
+Subproject commit d8d472c6be61262172ee67a80d50dfdae6400120
		`@ -1 +1 @@`
			`Subproject commit ff3e928c55566c49d42c1a72ce78bfd427fc3fe0`				`Subproject commit 32fc4ccb6fb88c8cb8de7f982e0f181a612cd126`
		`@ -1 +1 @@`
			`Subproject commit 7f4828d709eff54d4d0538cb24a219cbb95d86fa`				`Subproject commit d8d472c6be61262172ee67a80d50dfdae6400120`