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

12 years ago · bd1e64d462
parent 71abba5631 26f0d31d33
commit bd1e64d462
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d
+Subproject commit 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 274366fb8b90704586d7beef216b765cc0688b08
+Subproject commit 5438330f961347e3026326e78e0e70a1ec083aaf
		`@ -1 +1 @@`
			`Subproject commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d`				`Subproject commit 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d`
		`@ -1 +1 @@`
			`Subproject commit 274366fb8b90704586d7beef216b765cc0688b08`				`Subproject commit 5438330f961347e3026326e78e0e70a1ec083aaf`