From 91f58de26e3052d540cecd5c3cb5392669933a4b Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Sat, 27 Nov 2021 09:29:09 +0100
Subject: [PATCH] Adjust VC++ build after merge

---
 include/version.h                          | 2 +-
 tools/msvc/DarkRadiantCore.vcxproj         | 2 --
 tools/msvc/DarkRadiantCore.vcxproj.filters | 6 ------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/include/version.h b/include/version.h
index 78b277b2f9..7eb2bfd664 100644
--- a/include/version.h
+++ b/include/version.h
@@ -2,7 +2,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "2.14.0"
+#define RADIANT_VERSION "2.15.0pre1"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index fcd86cde27..5714a83872 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -47,7 +47,6 @@
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveCatmullRom.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveEditInstance.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveNURBS.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\doom3group\Doom3Group.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\doom3group\Doom3GroupNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\eclassmodel\EclassModelNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\EntityModule.cpp" />
@@ -760,7 +759,6 @@
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveEditInstance.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveNURBS.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\RenderableCurve.h" />
-    <ClInclude Include="..\..\radiantcore\entity\doom3group\Doom3Group.h" />
     <ClInclude Include="..\..\radiantcore\entity\doom3group\Doom3GroupNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\eclassmodel\EclassModelNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\EntityModule.h" />
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index 8f9412af4f..036c4b020c 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -457,9 +457,6 @@
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveNURBS.cpp">
       <Filter>src\entity\curve</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiantcore\entity\doom3group\Doom3Group.cpp">
-      <Filter>src\entity\doom3group</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiantcore\entity\doom3group\Doom3GroupNode.cpp">
       <Filter>src\entity\doom3group</Filter>
     </ClCompile>
@@ -1494,9 +1491,6 @@
     <ClInclude Include="..\..\radiantcore\entity\curve\RenderableCurve.h">
       <Filter>src\entity\curve</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\entity\doom3group\Doom3Group.h">
-      <Filter>src\entity\doom3group</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiantcore\entity\doom3group\Doom3GroupNode.h">
       <Filter>src\entity\doom3group</Filter>
     </ClInclude>