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

mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
12 years ago · fe9127cae9
parent 961f1e31e9 82cf5ce09d
commit fe9127cae9
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4027b878fb556a51ed29affd578e78aa70997480
+Subproject commit 307fab5fdad542247fa11a418be0e9635f4b5ebf
		`@ -1 +1 @@`
			`Subproject commit 4027b878fb556a51ed29affd578e78aa70997480`				`Subproject commit 307fab5fdad542247fa11a418be0e9635f4b5ebf`