thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge win32/Srb2win-vc10.vcxproj.filters

Browse source
This commit is contained in:
SteelT 2020-08-10 13:06:14 -04:00
parent fd000248b7
commit 9759c3666b
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/win32/Srb2win-vc10.vcxproj.filters
View file

@ -87,8 +87,6 @@
<ClCompile Include="win_vid.c"> <ClCompile Include="win_vid.c">
<Filter>Win32app</Filter> <Filter>Win32app</Filter>
</ClCompile> </ClCompile>
<<<<<<< HEAD
=======
<ClCompile Include="..\hardware\hw_bsp.c"> <ClCompile Include="..\hardware\hw_bsp.c">
<Filter>Hw_Hardware</Filter> <Filter>Hw_Hardware</Filter>
</ClCompile> </ClCompile>
@ -110,7 +108,6 @@
<ClCompile Include="..\hardware\hw_md2.c"> <ClCompile Include="..\hardware\hw_md2.c">
<Filter>Hw_Hardware</Filter> <Filter>Hw_Hardware</Filter>
</ClCompile> </ClCompile>
>>>>>>> srb2/next
<ClCompile Include="..\hardware\hw3sound.c"> <ClCompile Include="..\hardware\hw3sound.c">
<Filter>Hw_Hardware</Filter> <Filter>Hw_Hardware</Filter>
</ClCompile> </ClCompile>
@ -456,12 +453,10 @@
<ClCompile Include="..\string.c"> <ClCompile Include="..\string.c">
<Filter>M_Misc</Filter> <Filter>M_Misc</Filter>
</ClCompile> </ClCompile>
<<<<<<< HEAD
<ClCompile Include="..\hardware\hw_md2load.c" /> <ClCompile Include="..\hardware\hw_md2load.c" />
<ClCompile Include="..\hardware\hw_md3load.c" /> <ClCompile Include="..\hardware\hw_md3load.c" />
<ClCompile Include="..\hardware\hw_model.c" /> <ClCompile Include="..\hardware\hw_model.c" />
<ClCompile Include="..\hardware\u_list.c" /> <ClCompile Include="..\hardware\u_list.c" />
=======
<ClCompile Include="..\hardware\hw_md2load.c"> <ClCompile Include="..\hardware\hw_md2load.c">
<Filter>Hw_Hardware</Filter> <Filter>Hw_Hardware</Filter>
</ClCompile> </ClCompile>
@ -484,7 +479,6 @@
<ClCompile Include="..\r_portal.c"> <ClCompile Include="..\r_portal.c">
<Filter>R_Rend</Filter> <Filter>R_Rend</Filter>
</ClCompile> </ClCompile>
>>>>>>> srb2/next
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="afxres.h"> <ClInclude Include="afxres.h">
@ -508,8 +502,6 @@
<ClInclude Include="win_main.h"> <ClInclude Include="win_main.h">
<Filter>Win32app</Filter> <Filter>Win32app</Filter>
</ClInclude> </ClInclude>
<<<<<<< HEAD
=======
<ClInclude Include="..\hardware\hw_clip.h"> <ClInclude Include="..\hardware\hw_clip.h">
<Filter>Hw_Hardware</Filter> <Filter>Hw_Hardware</Filter>
</ClInclude> </ClInclude>
@ -546,7 +538,6 @@
<ClInclude Include="..\hardware\hw_model.h"> <ClInclude Include="..\hardware\hw_model.h">
<Filter>Hw_Hardware</Filter> <Filter>Hw_Hardware</Filter>
</ClInclude> </ClInclude>
>>>>>>> srb2/next
<ClInclude Include="..\hardware\hw3dsdrv.h"> <ClInclude Include="..\hardware\hw3dsdrv.h">
<Filter>Hw_Hardware</Filter> <Filter>Hw_Hardware</Filter>
</ClInclude> </ClInclude>