From b356ba035d9fdda5394c1e0545216c8293f6e890 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Fri, 24 Nov 2023 20:51:31 +0900 Subject: [PATCH] Update winimerge to 1.0.42 --- DownloadDeps.cmd | 8 ++++---- Externals/versions.txt | 2 +- Externals/winimerge | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index aa3b58a6a7b..ffba8bc8c55 100644 --- 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.13-x64.zip!Build\x64\Release ^ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.13-ARM.zip!Build\ARM\Release ^ https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.13-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/winimerge/releases/download/v1.0.42/winimerge-1.0.42.0-x86.zip!Build\x86\Release ^ +https://github.com/WinMerge/winimerge/releases/download/v1.0.42/winimerge-1.0.42.0-x64.zip!Build\x64\Release ^ +https://github.com/WinMerge/winimerge/releases/download/v1.0.42/winimerge-1.0.42.0-ARM.zip!Build\ARM\Release ^ +https://github.com/WinMerge/winimerge/releases/download/v1.0.42/winimerge-1.0.42.0-ARM64.zip!Build\ARM64\Release ^ https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x86.zip!Build\x86\Release ^ https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x64.zip!Build\x64\Release ^ https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-ARM64.zip!Build\ARM64\Release ^ diff --git a/Externals/versions.txt b/Externals/versions.txt index e7d1ffcf190..064c5a58c68 100644 --- 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.13 -- WinIMerge: 1.0.41.0 +- WinIMerge: 1.0.42.0 - freeimage: 3.18.0 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff) - WinWebDiff: 1.0.8.0 diff --git a/Externals/winimerge b/Externals/winimerge index 5a7d8aa500a..f7fc9d5ddf0 160000 --- a/Externals/winimerge +++ b/Externals/winimerge @@ -1 +1 @@ -Subproject commit 5a7d8aa500ae226994a678d5b79935e18f3381b8 +Subproject commit f7fc9d5ddf05785eb7046008fde657cfcea6ef2e