Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflicts fixed (again)

Browse Source
This commit is contained in:
Nekotekina
2014-03-06 15:55:50 +04:00
parent 05c6a96d27 d6596ca453
commit fac86aae58
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/rpcs3.vcxproj.filters
+4
View File
@@ -437,17 +437,21 @@
<Filter>Crypto</Filter> <Filter>Crypto</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\SysCalls\Static.cpp"> <ClCompile Include="Emu\SysCalls\Static.cpp">
<Filter>Emu\SysCalls</Filter> <Filter>Emu\SysCalls</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp"> <ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp">
<Filter>Emu\SysCalls\Modules</Filter> <Filter>Emu\SysCalls\Modules</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp"> <ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp">
<Filter>Emu\SysCalls\Modules</Filter> <Filter>Emu\SysCalls\Modules</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp"> <ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp">
<Filter>Emu\SysCalls\Modules</Filter> <Filter>Emu\SysCalls\Modules</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>