Update to winimerge to 1.0.39

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index 8fcf5a1..00d767b 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -20,10 +20,10 @@ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.12-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.12-ARM.zip!Build\ARM\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.12-ARM64.zip!Build\ARM64\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.38/winimerge-1.0.38.0-x86.zip!Build\x86\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.38/winimerge-1.0.38.0-x64.zip!Build\x64\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.38/winimerge-1.0.38.0-ARM.zip!Build\ARM\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.38/winimerge-1.0.38.0-ARM64.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.39/winimerge-1.0.39.0-x86.zip!Build\x86\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.39/winimerge-1.0.39.0-x64.zip!Build\x64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.39/winimerge-1.0.39.0-ARM.zip!Build\ARM\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.39/winimerge-1.0.39.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.6/winwebdiff-1.0.6.0-x86.zip!Build\x86\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.6/winwebdiff-1.0.6.0-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.6/winwebdiff-1.0.6.0-ARM64.zip!Build\ARM64\Release ^

diff --git a/Externals/freeimage b/Externals/freeimage
index 53cc1a4..6f47890 160000 (submodule)
--- a/Externals/freeimage
+++ b/Externals/freeimage
@@ -1 +1 @@
-Subproject commit 53cc1a4efa6989552922c69c22a6e9f94f084736
+Subproject commit 6f478909d55e0d36d59c75e3967a0584f99565d7

diff --git a/Externals/versions.txt b/Externals/versions.txt
index b702c62..a11e4d3 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -6,7 +6,7 @@ This file lists versions of the external components we are using.
 - POCO: 1.10.1
 - boost: 1.72.0
 - frhed: 0.10904.2017.12
-- WinIMerge: 1.0.38.0
+- WinIMerge: 1.0.39.0
   - freeimage: 3.18.0
   - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 - WinWebDiff: 1.0.6.0