teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 00:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- manually fix conflict

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-19 14:32:05 +02:00
parent ea826fb117
commit 795f25bd68
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/Windows/build.vcxproj.filters
View file

@ -53,10 +53,10 @@
<ClCompile Include="..\..\source\build\src\engine.cpp"> <ClCompile Include="..\..\source\build\src\engine.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\build\src\fix16.c"> <ClCompile Include="..\..\source\build\src\fix16.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\build\src\fix16_str.c"> <ClCompile Include="..\..\source\build\src\fix16_str.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\build\src\glbuild.cpp"> <ClCompile Include="..\..\source\build\src\glbuild.cpp">