Update frhed and ShellExtension

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index 8215962..6be2d95 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -3,11 +3,11 @@ set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path%
 set downloadsdir=%~dp0\build\WinMergeDownloadDeps
 set urls_destdirs=^
 https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^
-https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.17.11.0/ShellExtension-1.17.11.0.zip!Build ^
+https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.17.12.0/ShellExtension-1.17.12.0.zip!Build ^
 https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900.1-win32.zip!Build ^
 https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900.1-x64.zip!Build\X64 ^
-https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.2-win32.zip!Build ^
-https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.2-x64.zip!Build\X64 ^
+https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.3-win32.zip!Build ^
+https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.3-x64.zip!Build\X64 ^
 https://github.com/WinMerge/winimerge/releases/download/1.0.16.0/winimerge-1-0-16-0-exe.zip!Build ^
 https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 ^
 http://www.magicnotes.com/steelbytes/SBAppLocale_ENG.zip!Docs\Manual\Tools

diff --git a/Externals/frhed b/Externals/frhed
index a6b2980..86583c2 160000 (submodule)
--- a/Externals/frhed
+++ b/Externals/frhed
@@ -1 +1 @@
-Subproject commit a6b298084171b21f1b497d30c0c7b7cec2117ede
+Subproject commit 86583c20cd08feb7d7e5ee7f5d604ec66d945d0f

diff --git a/Externals/versions.txt b/Externals/versions.txt
index 5ae5d2d..8f65336 100644 (file)
--- 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.4.3p1
 boost: 1.72.0
-frhed: 0.10904.2017.2
+frhed: 0.10904.2017.3
 freeimage: 3.18.0
 WinIMerge: 1.0.16.0
 Google C++ Testing Framework: 1.70