- Update winimerge to 1.0.8.0

- Update freeimage to 3.18.0

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index 3a44dbd..d84df51 100644 (file)
--- 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 74c341c..2619b7a 100644 (file)
--- a/Externals/hg_clone.cmd
+++ b/Externals/hg_clone.cmd
@@ -1,6 +1,6 @@
 set urls_revs=^\r
-  https://bitbucket.org/winmerge/freeimage!05e4e65 ^\r
-  https://bitbucket.org/winmerge/winimerge!1.0.7.0 ^\r
+  https://bitbucket.org/winmerge/freeimage!bccca82 ^\r
+  https://bitbucket.org/winmerge/winimerge!1.0.8.0 ^\r
   https://bitbucket.org/winmerge/sevenzip!e3aff09 ^\r
   https://bitbucket.org/winmerge/frhed!7f942c2 ^\r
   https://bitbucket.org/winmerge/patch!b0a7238\r

diff --git a/Externals/versions.txt b/Externals/versions.txt
index 9d8b0f1..3fafb70 100644 (file)
--- 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