Merge branch 'GuiManuel'

Conflicts:
	inf3.csproj
This commit is contained in:
2014-05-09 10:45:11 +02:00
7 changed files with 64 additions and 9 deletions

View File

@@ -76,7 +76,9 @@
<Compile Include="src\Gui\MapPanel.cs" />
<Compile Include="src\Pathfinder.cs" />
<Compile Include="src\Gui\IEntity.cs" />
<Compile Include="src\Gui\SplashScreen.cs" />
<Compile Include="src\Gui\SplashScreen.cs" /
<Compile Include="src\Gui\OnlinePlayerList.cs" />
<Compile Include="src\Gui\IPlayer.cs" />
</ItemGroup>
<ItemGroup />
<ItemGroup>