Merge branch 'GuiManuel'
Conflicts: inf3.csproj
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user