cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 07:27:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Cyberboss
2017-11-02 10:45:13 -04:00
parent 8b76a76a5b 3dbd5a1d88
commit e1d9158f08
58 changed files with 832 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGControlPanel/TGControlPanel.csproj
+5 -5
View File
@@ -61,11 +61,11 @@
<Compile Include="Login.Designer.cs">
<DependentUpon>Login.cs</DependentUpon>
</Compile>
<Compile Include="Main.cs">
<Compile Include="ControlPanel.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Main.Designer.cs">
<DependentUpon>Main.cs</DependentUpon>
<Compile Include="ControlPanel.Designer.cs">
<DependentUpon>ControlPanel.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -87,8 +87,8 @@
<EmbeddedResource Include="Login.resx">
<DependentUpon>Login.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Main.resx">
<DependentUpon>Main.cs</DependentUpon>
<EmbeddedResource Include="ControlPanel.resx">
<DependentUpon>ControlPanel.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>