Skip to content

Commit 01248c8

Browse files
committed
Update winimerge to 1.0.41
1 parent 1a55a65 commit 01248c8

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

DownloadDeps.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2
2020
https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.12-x64.zip!Build\x64\Release ^
2121
https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.12-ARM.zip!Build\ARM\Release ^
2222
https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.12-ARM64.zip!Build\ARM64\Release ^
23-
https://github.com/WinMerge/winimerge/releases/download/v1.0.40/winimerge-1.0.40.0-x86.zip!Build\x86\Release ^
24-
https://github.com/WinMerge/winimerge/releases/download/v1.0.40/winimerge-1.0.40.0-x64.zip!Build\x64\Release ^
25-
https://github.com/WinMerge/winimerge/releases/download/v1.0.40/winimerge-1.0.40.0-ARM.zip!Build\ARM\Release ^
26-
https://github.com/WinMerge/winimerge/releases/download/v1.0.40/winimerge-1.0.40.0-ARM64.zip!Build\ARM64\Release ^
23+
https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-x86.zip!Build\x86\Release ^
24+
https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-x64.zip!Build\x64\Release ^
25+
https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM.zip!Build\ARM\Release ^
26+
https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM64.zip!Build\ARM64\Release ^
2727
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x86.zip!Build\x86\Release ^
2828
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x64.zip!Build\x64\Release ^
2929
https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-ARM64.zip!Build\ARM64\Release ^

Externals/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file lists versions of the external components we are using.
66
- POCO: 1.10.1
77
- boost: 1.72.0
88
- frhed: 0.10904.2017.12
9-
- WinIMerge: 1.0.40.0
9+
- WinIMerge: 1.0.41.0
1010
- freeimage: 3.18.0
1111
- LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
1212
- WinWebDiff: 1.0.7.0

Src/WinIMergeLib.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ struct IImgMergeWindow
182182
virtual void SetVerticalFlip(int pane, bool flip) = 0;
183183
virtual DIFF_ALGORITHM GetDiffAlgorithm() const = 0;
184184
virtual void SetDiffAlgorithm(DIFF_ALGORITHM diffAlgorithm) = 0;
185+
virtual bool IsSaveSupported(int pane) const = 0;
185186
};
186187

187188
struct IImgToolWindow

0 commit comments

Comments
 (0)