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

13 years ago · fa4e724a0e
parent 45d6980ff9 831c0df9af
commit fa4e724a0e
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2
+Subproject commit 26d642b2620397b76d5fbb64a9ef5ca8f2334f72