From 25d862443bbc17cc128341300cd4b2e6d1739327 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 27 Oct 2024 06:23:24 +0900 Subject: [PATCH] Update winwebdiff to 1.0.17 --- DownloadDeps.cmd | 6 +++--- Externals/versions.txt | 2 +- Externals/winwebdiff | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 32eebbd0ee5..5009ab11f46 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -24,9 +24,9 @@ https://github.com/WinMerge/winimerge/releases/download/v1.0.45/winimerge-1.0.45 https://github.com/WinMerge/winimerge/releases/download/v1.0.45/winimerge-1.0.45.0-x64.zip!Build\x64\Release ^ https://github.com/WinMerge/winimerge/releases/download/v1.0.45/winimerge-1.0.45.0-ARM.zip!Build\ARM\Release ^ https://github.com/WinMerge/winimerge/releases/download/v1.0.45/winimerge-1.0.45.0-ARM64.zip!Build\ARM64\Release ^ -https://github.com/WinMerge/winwebdiff/releases/download/v1.0.16/winwebdiff-1.0.16.0-x86.zip!Build\x86\Release ^ -https://github.com/WinMerge/winwebdiff/releases/download/v1.0.16/winwebdiff-1.0.16.0-x64.zip!Build\x64\Release ^ -https://github.com/WinMerge/winwebdiff/releases/download/v1.0.16/winwebdiff-1.0.16.0-ARM64.zip!Build\ARM64\Release ^ +https://github.com/WinMerge/winwebdiff/releases/download/v1.0.17/winwebdiff-1.0.17.0-x86.zip!Build\x86\Release ^ +https://github.com/WinMerge/winwebdiff/releases/download/v1.0.17/winwebdiff-1.0.17.0-x64.zip!Build\x64\Release ^ +https://github.com/WinMerge/winwebdiff/releases/download/v1.0.17/winwebdiff-1.0.17.0-ARM64.zip!Build\ARM64\Release ^ https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^ https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^ https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-windows-i386.exe!Build\jq ^ diff --git a/Externals/versions.txt b/Externals/versions.txt index 00354c78d3d..a0c26c38c18 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -9,7 +9,7 @@ This file lists versions of the external components we are using. - WinIMerge: 1.0.45.0 - freeimage: 3.18.0 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff) -- WinWebDiff: 1.0.16.0 +- WinWebDiff: 1.0.17.0 - WebView2: 1.0.1518.46 - wil: 1.0.191107.2 - rapidjson: 1.1.1 diff --git a/Externals/winwebdiff b/Externals/winwebdiff index 7cdd8b8d306..fb065aa3467 160000 --- a/Externals/winwebdiff +++ b/Externals/winwebdiff @@ -1 +1 @@ -Subproject commit 7cdd8b8d306e240cc0dcc8d893bc2167fe32a9f8 +Subproject commit fb065aa34676974502e9f14bf255c8775300c146