<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1806U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1806U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1806U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1806U</TargetName>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
<CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1806U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1806U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1806U</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1806U</TargetName>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
<CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
</ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1806U</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1806U</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1806U</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1806U</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
set urls_destdirs=^
https://bitbucket.org/winmerge/winmerge/downloads/winmerge_manual_build_tools_v1.zip!Docs\Users\Manual\build ^
https://bitbucket.org/winmerge/winmerge/downloads/ShellExtension-1.17.4.0.zip!Build ^
-https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1805.1-win32.zip!Build ^
-https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1805.1-x64.zip!Build\X64 ^
+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/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 ^
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/sevenzip!571e08f ^\r
+ https://bitbucket.org/winmerge/sevenzip!899ceeb ^\r
https://bitbucket.org/winmerge/frhed!7f942c2 ^\r
https://bitbucket.org/winmerge/patch!b0a7238\r
\r
WinIMerge: 1.0.7.0
Google C++ Testing Framework: 1.70
GnuWin32 Patch for Windows: 2.5.9-7
-7-zip: 18.05
+7-zip: 18.06