Update winimerge to 1.0.14.0

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index cf3c2dd..bae1dee 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -8,7 +8,7 @@ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900
 https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900.1-x64.zip!Build\X64 ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.1-win32.zip!Build ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.1-x64.zip!Build\X64 ^
-https://github.com/WinMerge/winimerge/releases/download/1.0.13.0/winimerge-1-0-13-0-exe.zip!Build ^
+https://github.com/WinMerge/winimerge/releases/download/1.0.14.0/winimerge-1-0-14-0-exe.zip!Build ^
 https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 ^
 http://www.magicnotes.com/steelbytes/SBAppLocale_ENG.zip!Docs\Manual\Tools
 

diff --git a/Externals/versions.txt b/Externals/versions.txt
index 59973e2..f834c9a 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -7,7 +7,7 @@ POCO: 1.4.3p1
 boost: 1.72.0
 frhed: 0.10904.2017.1
 freeimage: 3.18.0
-WinIMerge: 1.0.13.0
+WinIMerge: 1.0.14.0
 Google C++ Testing Framework: 1.70
 GnuWin32 Patch for Windows: 2.5.9-7
 7-zip: 19.00

diff --git a/Externals/winimerge b/Externals/winimerge
index 8fce340..5212df1 160000 (submodule)
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
-Subproject commit 8fce340856d97166bfb75739b5794735ae51c606
+Subproject commit 5212df14d871222f0fbd4b7d63b4af681257f21d