NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network - projectfile fix

This commit is contained in:
Sam Mario Svensson 2013-12-03 13:16:44 +01:00
parent aa19002cbe
commit 1466c0db31
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
View File

@ -30,16 +30,10 @@
<ClInclude Include="OysterByte.h" /> <ClInclude Include="OysterByte.h" />
<ClInclude Include="IPostBox.h" /> <ClInclude Include="IPostBox.h" />
<ClInclude Include="PostBox.h" /> <ClInclude Include="PostBox.h" />
<<<<<<< HEAD
<ClInclude Include="IClient.h" /> <ClInclude Include="IClient.h" />
<ClInclude Include="ThreadedClient.h" /> <ClInclude Include="ThreadedClient.h" />
=======
<<<<<<< HEAD
<ClInclude Include="Messages\MessagePlayerPos.h" /> <ClInclude Include="Messages\MessagePlayerPos.h" />
=======
<ClInclude Include="IClient.h" /> <ClInclude Include="IClient.h" />
<ClInclude Include="ThreadedClient.h" /> <ClInclude Include="ThreadedClient.h" />
>>>>>>> Client interface and class for both server and client. now using postbox system
>>>>>>> 10c1dc57f3c9235ca6c6d4e69fed43465daa7752
</ItemGroup> </ItemGroup>
</Project> </Project>