Update winimerge to 1.0.41

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index d33c6a1..5944d8c 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.40/winimerge-1.0.40.0-x86.zip!Build\x86\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.40/winimerge-1.0.40.0-x64.zip!Build\x64\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.40/winimerge-1.0.40.0-ARM.zip!Build\ARM\Release ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.40/winimerge-1.0.40.0-ARM64.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-x86.zip!Build\x86\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-x64.zip!Build\x64\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM.zip!Build\ARM\Release ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x86.zip!Build\x86\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-ARM64.zip!Build\ARM64\Release ^

diff --git a/Externals/versions.txt b/Externals/versions.txt
index 97aabde..3bcc20b 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.40.0
+- WinIMerge: 1.0.41.0
   - freeimage: 3.18.0
   - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 - WinWebDiff: 1.0.7.0

diff --git a/Externals/winimerge b/Externals/winimerge
index 15f73dc..5a7d8aa 160000 (submodule)
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
-Subproject commit 15f73dcc922fc645556257dc5ea0d5fdb8709fb9
+Subproject commit 5a7d8aa500ae226994a678d5b79935e18f3381b8

diff --git a/Src/WinIMergeLib.h b/Src/WinIMergeLib.h
index dad828c..2ad91d3 100644 (file)
--- a/Src/WinIMergeLib.h
+++ b/Src/WinIMergeLib.h
@@ -182,6 +182,7 @@ struct IImgMergeWindow
        virtual void SetVerticalFlip(int pane, bool flip) = 0;\r
        virtual DIFF_ALGORITHM GetDiffAlgorithm() const = 0;\r
        virtual void SetDiffAlgorithm(DIFF_ALGORITHM diffAlgorithm) = 0;\r
+       virtual bool IsSaveSupported(int pane) const = 0;\r
 };\r
 \r
 struct IImgToolWindow\r