From e8ae59dbaa1f9a73392558861b98244764cdb993 Mon Sep 17 00:00:00 2001
From: GreyMerlin <GreyMerlin@gmail.com>
Date: Wed, 25 Jul 2018 23:29:13 -0700
Subject: [PATCH] Eliminate use of deprecated `GetVersionEx()` (2)

* Also for VS2015
---
 Src/Merge.vs2015.vcxproj         | 1 +
 Src/Merge.vs2015.vcxproj.filters | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Src/Merge.vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
index 878c64cf7..b74023c0a 100644
--- a/Src/Merge.vs2015.vcxproj
+++ b/Src/Merge.vs2015.vcxproj
@@ -1122,6 +1122,7 @@
     <ClInclude Include="Common\VersionInfo.h" />
     <ClInclude Include="VSSHelper.h" />
     <ClInclude Include="VssPromptDlg.h" />
+    <ClInclude Include="Win_VersionHelper.h" />
     <ClInclude Include="WMGotoDlg.h" />
     <ClInclude Include="diffutils\lib\cmpbuf.h" />
     <ClInclude Include="diffutils\config.h" />
diff --git a/Src/Merge.vs2015.vcxproj.filters b/Src/Merge.vs2015.vcxproj.filters
index c0fcb89fc..226495562 100644
--- a/Src/Merge.vs2015.vcxproj.filters
+++ b/Src/Merge.vs2015.vcxproj.filters
@@ -1449,6 +1449,9 @@
     <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
       <Filter>MergeTest</Filter>
     </ClInclude>
+    <ClInclude Include="Win_VersionHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\binarydiff.ico">
-- 
2.11.0