Update winimerge to 1.0.37

WinMerge · Oct 13, 2022 · b22b846 · b22b846
1 parent 06a7bee
commit b22b846
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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.10-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.10-ARM.zip!Build\ARM\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.10-ARM64.zip!Build\ARM64\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.35/winimerge-1.0.35.0-x86.zip!Build\x86\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.35/winimerge-1.0.35.0-x64.zip!Build\x64\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.35/winimerge-1.0.35.0-ARM.zip!Build\ARM\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.35/winimerge-1.0.35.0-ARM64.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.37/winimerge-1.0.37.0-x86.zip!Build\x86\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.37/winimerge-1.0.37.0-x64.zip!Build\x64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.37/winimerge-1.0.37.0-ARM.zip!Build\ARM\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.37/winimerge-1.0.37.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.4/winwebdiff-1.0.4.0-x86.zip!Build\x86\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.4/winwebdiff-1.0.4.0-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.4/winwebdiff-1.0.4.0-ARM64.zip!Build\ARM64\Release ^

diff --git 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.10
-- WinIMerge: 1.0.35.0
+- WinIMerge: 1.0.37.0
   - freeimage: 3.18.0
   - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 - WinWebDiff: 1.0.4.0

diff --git a/Externals/winimerge b/Externals/winimerge
+87 −43		src/WinIMergeLib/ImgConverter.hpp
+1 −0		src/WinIMergeLib/Win78Libraries.cpp
+1 −0		src/WinIMergeLib/Win78Libraries.h
+4 −0		src/WinIMergeLib/WinIMergeLib.cpp