diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 5944d8cb955..9710b25b31b 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -16,10 +16,10 @@ https://github.com/WinMerge/winmerge/releases/download/Merge7z2301.0/Merge7z2301 https://github.com/WinMerge/winmerge/releases/download/Merge7z2301.0/Merge7z2301.0-x64.zip!Build\X64\Release ^ https://github.com/WinMerge/winmerge/releases/download/Merge7z2301.0/Merge7z2301.0-ARM.zip!Build\ARM64\Release ^ https://github.com/WinMerge/winmerge/releases/download/Merge7z2301.0/Merge7z2301.0-ARM64.zip!Build\ARM64\Release ^ -https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.12-x86.zip!Build\x86\Release ^ -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/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.13-x86.zip!Build\x86\Release ^ +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 ^ diff --git a/Externals/frhed b/Externals/frhed index da7850ac180..7d81ad569f3 160000 --- a/Externals/frhed +++ b/Externals/frhed @@ -1 +1 @@ -Subproject commit da7850ac18061902e6b5a9176e3404dc52f33194 +Subproject commit 7d81ad569f3a3197c4925cc4209659f3f0da974e diff --git a/Externals/versions.txt b/Externals/versions.txt index 3bcc20b6c08..8667d9acbba 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -5,7 +5,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 +- frhed: 0.10904.2017.13 - WinIMerge: 1.0.41.0 - freeimage: 3.18.0 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)