libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-23 17:45:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bad merge in vcxproj filters file.

Browse Source
This commit is contained in:
Unknown W. Brackets 2012-12-24 02:48:10 -08:00
parent ab35c7f612
commit 65cd63b44e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/Core.vcxproj.filters
View File

@ -294,9 +294,9 @@
<ClCompile Include="HLE\sceImpose.cpp">
<Filter>HLE\Libraries</Filter>
</ClCompile>
<<<<<<< HEAD
<ClCompile Include="HW\MediaEngine.cpp">
=======
<Filter>HW</Filter>
</ClCompile>
<ClCompile Include="Util\PPGeDraw.cpp">
<Filter>Util</Filter>
</ClCompile>
@ -346,7 +346,6 @@
<Filter>Dialog</Filter>
</ClCompile>
<ClCompile Include="HW\SasAudio.cpp">
>>>>>>> master
<Filter>HW</Filter>
</ClCompile>
<ClCompile Include="HLE\sceUsb.cpp">
@ -592,6 +591,8 @@
<Filter>HLE\Libraries</Filter>
</ClInclude>
<ClInclude Include="HW\MediaEngine.h">
<Filter>HW</Filter>
</ClInclude>
<ClInclude Include="Util\PPGeDraw.h">
<Filter>Util</Filter>
</ClInclude>