Update date in lsm files

Reset submodule main/applications/kdiff3/admin to latest HEAD
Fix invalid headers in PNG files and optimize for size
97 changed files with 5 additions and 5 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit b5373d6ec2d9431fa6c1c218137f9e3f5ca1f4af
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463
+Subproject commit d4e69bf65ff0b76a2b78b98e86e01c122cbe8831
--- a/doc/da/dirbrowser.png
+++ b/doc/da/dirbrowser.png
--- a/doc/da/dirmergebig.png
+++ b/doc/da/dirmergebig.png
--- a/doc/da/merge_current.png
+++ b/doc/da/merge_current.png
--- a/doc/da/new.png
+++ b/doc/da/new.png
--- a/doc/da/open_dialog.png
+++ b/doc/da/open_dialog.png
--- a/doc/da/screenshot_diff.png
+++ b/doc/da/screenshot_diff.png
--- a/doc/da/screenshot_merge.png
+++ b/doc/da/screenshot_merge.png
--- a/doc/da/white_space.png
+++ b/doc/da/white_space.png
--- a/doc/de/dirbrowser.png
+++ b/doc/de/dirbrowser.png
--- a/doc/de/dirmergebig.png
+++ b/doc/de/dirmergebig.png
--- a/doc/de/merge_current.png
+++ b/doc/de/merge_current.png
--- a/doc/de/new.png
+++ b/doc/de/new.png
--- a/doc/de/open_dialog.png
+++ b/doc/de/open_dialog.png
--- a/doc/de/screenshot_diff.png
+++ b/doc/de/screenshot_diff.png
--- a/doc/de/screenshot_merge.png
+++ b/doc/de/screenshot_merge.png
--- a/doc/de/white_space.png
+++ b/doc/de/white_space.png
--- a/doc/en/common/bottom-left.png
+++ b/doc/en/common/bottom-left.png
--- a/doc/en/common/bottom-middle.png
+++ b/doc/en/common/bottom-middle.png
--- a/doc/en/common/bottom-right.png
+++ b/doc/en/common/bottom-right.png
--- a/doc/en/common/headerbg.png
+++ b/doc/en/common/headerbg.png
--- a/doc/en/common/kde_gear_64.png
+++ b/doc/en/common/kde_gear_64.png
--- a/doc/en/common/kde_logo_bg.png
+++ b/doc/en/common/kde_logo_bg.png
--- a/doc/en/common/top-left.png
+++ b/doc/en/common/top-left.png
--- a/doc/en/common/top-middle.png
+++ b/doc/en/common/top-middle.png
--- a/doc/en/common/top-right-konqueror.png
+++ b/doc/en/common/top-right-konqueror.png
--- a/doc/en/dirbrowser.png
+++ b/doc/en/dirbrowser.png
--- a/doc/en/dirmergebig.png
+++ b/doc/en/dirmergebig.png
--- a/doc/en/merge_current.png
+++ b/doc/en/merge_current.png
--- a/doc/en/new.png
+++ b/doc/en/new.png
--- a/doc/en/open_dialog.png
+++ b/doc/en/open_dialog.png
--- a/doc/en/screenshot_diff.png
+++ b/doc/en/screenshot_diff.png
--- a/doc/en/screenshot_merge.png
+++ b/doc/en/screenshot_merge.png
--- a/doc/en/white_space.png
+++ b/doc/en/white_space.png
--- a/doc/es/dirbrowser.png
+++ b/doc/es/dirbrowser.png
--- a/doc/es/dirmergebig.png
+++ b/doc/es/dirmergebig.png
--- a/doc/es/merge_current.png
+++ b/doc/es/merge_current.png
--- a/doc/es/new.png
+++ b/doc/es/new.png
--- a/doc/es/open_dialog.png
+++ b/doc/es/open_dialog.png
--- a/doc/es/screenshot_diff.png
+++ b/doc/es/screenshot_diff.png
--- a/doc/es/screenshot_merge.png
+++ b/doc/es/screenshot_merge.png
--- a/doc/es/white_space.png
+++ b/doc/es/white_space.png
--- a/doc/et/dirbrowser.png
+++ b/doc/et/dirbrowser.png
--- a/doc/et/dirmergebig.png
+++ b/doc/et/dirmergebig.png
--- a/doc/et/merge_current.png
+++ b/doc/et/merge_current.png
--- a/doc/et/new.png
+++ b/doc/et/new.png
--- a/doc/et/open_dialog.png
+++ b/doc/et/open_dialog.png
--- a/doc/et/screenshot_diff.png
+++ b/doc/et/screenshot_diff.png
--- a/doc/et/screenshot_merge.png
+++ b/doc/et/screenshot_merge.png
--- a/doc/et/white_space.png
+++ b/doc/et/white_space.png
--- a/doc/fr/dirbrowser.png
+++ b/doc/fr/dirbrowser.png
--- a/doc/fr/dirmergebig.png
+++ b/doc/fr/dirmergebig.png
--- a/doc/fr/merge_current.png
+++ b/doc/fr/merge_current.png
--- a/doc/fr/new.png
+++ b/doc/fr/new.png
--- a/doc/fr/open_dialog.png
+++ b/doc/fr/open_dialog.png
--- a/doc/fr/screenshot_diff.png
+++ b/doc/fr/screenshot_diff.png
--- a/doc/fr/screenshot_merge.png
+++ b/doc/fr/screenshot_merge.png
--- a/doc/fr/white_space.png
+++ b/doc/fr/white_space.png
--- a/doc/it/dirbrowser.png
+++ b/doc/it/dirbrowser.png
--- a/doc/it/dirmergebig.png
+++ b/doc/it/dirmergebig.png
--- a/doc/it/merge_current.png
+++ b/doc/it/merge_current.png
--- a/doc/it/new.png
+++ b/doc/it/new.png
--- a/doc/it/open_dialog.png
+++ b/doc/it/open_dialog.png
--- a/doc/it/screenshot_diff.png
+++ b/doc/it/screenshot_diff.png
--- a/doc/it/screenshot_merge.png
+++ b/doc/it/screenshot_merge.png
--- a/doc/it/white_space.png
+++ b/doc/it/white_space.png
--- a/doc/nl/dirbrowser.png
+++ b/doc/nl/dirbrowser.png
--- a/doc/nl/dirmergebig.png
+++ b/doc/nl/dirmergebig.png
--- a/doc/nl/merge_current.png
+++ b/doc/nl/merge_current.png
--- a/doc/nl/new.png
+++ b/doc/nl/new.png
--- a/doc/nl/open_dialog.png
+++ b/doc/nl/open_dialog.png
--- a/doc/nl/screenshot_diff.png
+++ b/doc/nl/screenshot_diff.png
--- a/doc/nl/screenshot_merge.png
+++ b/doc/nl/screenshot_merge.png
--- a/doc/nl/white_space.png
+++ b/doc/nl/white_space.png
--- a/doc/pt/dirbrowser.png
+++ b/doc/pt/dirbrowser.png
--- a/doc/pt/dirmergebig.png
+++ b/doc/pt/dirmergebig.png
--- a/doc/pt/merge_current.png
+++ b/doc/pt/merge_current.png
--- a/doc/pt/new.png
+++ b/doc/pt/new.png
--- a/doc/pt/open_dialog.png
+++ b/doc/pt/open_dialog.png
--- a/doc/pt/screenshot_diff.png
+++ b/doc/pt/screenshot_diff.png
--- a/doc/pt/screenshot_merge.png
+++ b/doc/pt/screenshot_merge.png
--- a/doc/pt/white_space.png
+++ b/doc/pt/white_space.png
--- a/doc/sv/dirbrowser.png
+++ b/doc/sv/dirbrowser.png
--- a/doc/sv/dirmergebig.png
+++ b/doc/sv/dirmergebig.png
--- a/doc/sv/merge_current.png
+++ b/doc/sv/merge_current.png
--- a/doc/sv/new.png
+++ b/doc/sv/new.png
--- a/doc/sv/open_dialog.png
+++ b/doc/sv/open_dialog.png
--- a/doc/sv/screenshot_diff.png
+++ b/doc/sv/screenshot_diff.png
--- a/doc/sv/screenshot_merge.png
+++ b/doc/sv/screenshot_merge.png
--- a/doc/sv/white_space.png
+++ b/doc/sv/white_space.png
--- a/kdiff3plugin/kdiff3plugin.desktop
+++ b/kdiff3plugin/kdiff3plugin.desktop
@ -4,4 +4,4 @@ Type=Application
 Name=Compare/Merge Files/Directories with KDiff3
 Icon=kdiff3
 X-TDE-ParentApp=konqueror
-#DocPath=konq-plugins/kdiff3plugin/index.html
+#X-DocPath=konq-plugins/kdiff3plugin/index.html
--- a/src/hi16-app-kdiff3.png
+++ b/src/hi16-app-kdiff3.png
--- a/src/hi32-app-kdiff3.png
+++ b/src/hi32-app-kdiff3.png
--- a/src/kdiff3.lsm
+++ b/src/kdiff3.lsm
@ -1,7 +1,7 @@
 Begin4
 Title:          kdiff3
-Version:        R14.0.0
+Version:        R14.0.4
-Entered-date:   2010-05-10
+Entered-date:   2016-10-23
 Description:    Tool for comparing and merging files or directories
 Keywords:       TDE Qt
 Author:         Joachim Eibl <joachim at gmx.de>
--- a/src/lo16-app-kdiff3.png
+++ b/src/lo16-app-kdiff3.png
--- a/src/lo32-app-kdiff3.png
+++ b/src/lo32-app-kdiff3.png
Author	SHA1	Message	Date
Slávek Banko	d85cf15ed3	Update date in lsm files	9 years ago
Slávek Banko	ca4e31fbf0	Reset submodule main/applications/kdiff3/admin to latest HEAD	9 years ago
Timothy Pearson	7d0941ce81	Fix invalid headers in PNG files and optimize for size (cherry picked from commit `7f392bb439`)	9 years ago
Slávek Banko	f909f523f7	Reset submodule main/applications/kdiff3/cmake to latest HEAD	10 years ago
Slávek Banko	727e2f3f6d	Reset submodule main/applications/kdiff3/cmake to latest HEAD	10 years ago
Slávek Banko	4b9b1cda35	Update version number for new target R14.0.4	10 years ago
Slávek Banko	fc3447242d	Update date in lsm files	10 years ago
Slávek Banko	7c759e6dde	Update version number for new target R14.0.3	10 years ago
Slávek Banko	59acfef91e	Update date in lsm files	10 years ago
Slávek Banko	d654d1f725	Update version number for new target R14.0.2	10 years ago
Slávek Banko	fc851c9203	Update date in lsm files	10 years ago
Slávek Banko	31ad8579e3	Update version in lsm files	10 years ago
Slávek Banko	74f8700c53	Reset submodule main/applications/kdiff3/cmake to latest HEAD	10 years ago
Slávek Banko	82c00ad239	Reset submodule main/applications/kdiff3/cmake to latest HEAD	11 years ago
Slávek Banko	b2e84ea9a6	Reset submodule main/applications/kdiff3/admin to latest HEAD	11 years ago
Michele Calgaro	db127cd70c	Fixed wrong DocPath strings. This relates to bug 2319. (cherry picked from commit `23ca514701`) Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>	11 years ago
		`@ -1 +1 @@`
			`Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af`				`Subproject commit b5373d6ec2d9431fa6c1c218137f9e3f5ca1f4af`
		`@ -1 +1 @@`
			`Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463`				`Subproject commit d4e69bf65ff0b76a2b78b98e86e01c122cbe8831`