cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 16:11:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds the test merge manager to the CP

Browse Source
This commit is contained in:
Cyberboss
2017-11-11 17:27:58 -05:00
parent 2073b7506e
commit ff277701a5
7 changed files with 2586 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGControlPanel/TGControlPanel.csproj
+13
View File
@@ -43,6 +43,9 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="Octokit, Version=0.28.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octokit.0.28.0\lib\net45\Octokit.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -96,6 +99,12 @@
<Compile Include="ControlPanel\StaticPage.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="TestMergeManager.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="TestMergeManager.Designer.cs">
<DependentUpon>TestMergeManager.cs</DependentUpon>
</Compile>
<Compile Include="ServerOpForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -108,9 +117,13 @@
<EmbeddedResource Include="ControlPanel\ControlPanel.resx">
<DependentUpon>ControlPanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="TestMergeManager.resx">
<DependentUpon>TestMergeManager.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>