From: Takashi Sawanaka Date: Sun, 24 Mar 2019 11:59:09 +0000 (+0900) Subject: Merge with stable X-Git-Tag: 2.16.4+-jp-10~126 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=02aa96bd25846192321de4b0ea036d12a1313ddd;p=winmerge-jp%2Fwinmerge-jp.git Merge with stable --HG-- branch : jp --- 02aa96bd25846192321de4b0ea036d12a1313ddd diff --cc DownloadDeps.cmd index f67ff66a8,3a44dbda9..f95f484d3 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@@ -2,10 -2,10 +2,10 @@@ setloca set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path% set downloadsdir=%~dp0\build\WinMergeDownloadDeps set urls_destdirs=^ -https://bitbucket.org/winmerge/winmerge/downloads/winmerge_manual_build_tools_v1.zip!Docs\Users\Manual\build ^ +https://bitbucket.org/sdottaka/winmerge-v2/downloads/winmerge_manual_another_build_tools_v1.zip!Docs\Users\Manual\build ^ - https://bitbucket.org/winmerge/winmerge/downloads/ShellExtension-1.17.5.0.zip!Build ^ - https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1806.1-win32.zip!Build ^ - https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1806.1-x64.zip!Build\X64 ^ + https://bitbucket.org/winmerge/winmerge/downloads/ShellExtension-1.17.6.0.zip!Build ^ + 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 ^