From 3b7e6b06a28135869fa86540bee70ff111b72bb9 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sat, 30 Mar 2019 16:03:51 +0900 Subject: [PATCH] - Update winimerge to 1.0.8.0 - Update freeimage to 3.18.0 --- DownloadDeps.cmd | 2 +- Externals/hg_clone.cmd | 4 ++-- Externals/versions.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 3a44dbda9..d84df5141 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -8,7 +8,7 @@ https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1900.1-win32.zip!Build https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1900.1-x64.zip!Build\X64 ^ https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-win32.zip!Build ^ https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-x64.zip!Build\X64 ^ -https://bitbucket.org/winmerge/winimerge/downloads/winimerge-1-0-7-0-exe.zip!Build ^ +https://bitbucket.org/winmerge/winimerge/downloads/winimerge-1-0-8-0-exe.zip!Build ^ https://bitbucket.org/winmerge/patch/downloads/patch-2.5.9-7-bin.zip!Build\GnuWin32 pushd "%~dp0" diff --git a/Externals/hg_clone.cmd b/Externals/hg_clone.cmd index 74c341caa..2619b7aa4 100644 --- a/Externals/hg_clone.cmd +++ b/Externals/hg_clone.cmd @@ -1,6 +1,6 @@ set urls_revs=^ - https://bitbucket.org/winmerge/freeimage!05e4e65 ^ - https://bitbucket.org/winmerge/winimerge!1.0.7.0 ^ + https://bitbucket.org/winmerge/freeimage!bccca82 ^ + https://bitbucket.org/winmerge/winimerge!1.0.8.0 ^ https://bitbucket.org/winmerge/sevenzip!e3aff09 ^ https://bitbucket.org/winmerge/frhed!7f942c2 ^ https://bitbucket.org/winmerge/patch!b0a7238 diff --git a/Externals/versions.txt b/Externals/versions.txt index 9d8b0f1d3..3fafb7026 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -6,8 +6,8 @@ This file lists versions of the external components we are using. POCO: 1.4.3p1 boost: 1.64.0 frhed: 0.10904.2017.1 -freeimage: 3.16.0 -WinIMerge: 1.0.7.0 +freeimage: 3.18.0 +WinIMerge: 1.0.8.0 Google C++ Testing Framework: 1.70 GnuWin32 Patch for Windows: 2.5.9-7 7-zip: 19.00 -- 2.11.0