diff options
| author | AShifter <[email protected]> | 2017-06-05 09:49:46 -0600 |
|---|---|---|
| committer | AShifter <[email protected]> | 2017-06-05 09:49:46 -0600 |
| commit | 61c906e596145bbedd60725c6dcee68c34a27907 (patch) | |
| tree | cd7a00d501affe96028bfb21a8dec90c2ee63f2c /ShiftOS_TheReturn/ShiftOS.Engine.csproj | |
| parent | 66ea2cf2fdeeaa025bd22961a0400423233c505d (diff) | |
| parent | 3e11eca70481841b6e2f2253d667944779cfd5fb (diff) | |
| download | shiftos_thereturn-61c906e596145bbedd60725c6dcee68c34a27907.tar.gz shiftos_thereturn-61c906e596145bbedd60725c6dcee68c34a27907.tar.bz2 shiftos_thereturn-61c906e596145bbedd60725c6dcee68c34a27907.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS_TheReturn/ShiftOS.Engine.csproj')
| -rw-r--r-- | ShiftOS_TheReturn/ShiftOS.Engine.csproj | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj index fb33dc5..f70c41e 100644 --- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj +++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj @@ -109,8 +109,10 @@ <Compile Include="FileSkimmerBackend.cs" /> <Compile Include="Infobox.cs" /> <Compile Include="IShiftOSWindow.cs" /> + <Compile Include="IStatusIcon.cs" /> <Compile Include="KernelWatchdog.cs" /> <Compile Include="Localization.cs" /> + <Compile Include="LoginManager.cs" /> <Compile Include="NotificationDaemon.cs" /> <Compile Include="OutOfBoxExperience.cs" /> <Compile Include="Paths.cs" /> @@ -123,6 +125,7 @@ </Compile> <Compile Include="SaveSystem.cs" /> <Compile Include="Scripting.cs" /> + <Compile Include="Server.cs" /> <Compile Include="ServerManager.cs" /> <Compile Include="ShiftnetSite.cs" /> <Compile Include="Shiftorium.cs" /> @@ -131,10 +134,7 @@ <Compile Include="TerminalBackend.cs" /> <Compile Include="TerminalTextWriter.cs" /> <Compile Include="TutorialManager.cs" /> - <Compile Include="UniteClient.cs" /> - <Compile Include="UniteTestCommands.cs" /> <Compile Include="UserManagementCommands.cs" /> - <Compile Include="VirusEngine.cs" /> <Compile Include="WinOpenAttribute.cs" /> <EmbeddedResource Include="Infobox.resx"> <DependentUpon>Infobox.cs</DependentUpon> @@ -163,10 +163,6 @@ <Project>{A069089A-8962-4607-B2B2-4CF4A371066E}</Project> <Name>ShiftOS.Objects</Name> </ProjectReference> - <ProjectReference Include="..\ShiftOS.Server\ShiftOS.Server.csproj"> - <Project>{226C63B4-E60D-4949-B4E7-7A2DDBB96776}</Project> - <Name>ShiftOS.Server</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <COMReference Include="MediaPlayer"> |