diff options
| author | william341 <[email protected]> | 2017-05-06 16:49:05 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2017-05-06 16:49:05 -0700 |
| commit | d8004332b61bb310321b48e0f80efcb6ae68e579 (patch) | |
| tree | 5777e7e3cba9cdc12207b684e10a09293cb03250 /ShiftOS.WinForms/ShiftOS.WinForms.csproj | |
| parent | 7d744a64d05250e3883126db90f4e4c265ccfffa (diff) | |
| parent | d0d193bb1b869697d633d7ccac35179241f8e981 (diff) | |
| download | shiftos_thereturn-d8004332b61bb310321b48e0f80efcb6ae68e579.tar.gz shiftos_thereturn-d8004332b61bb310321b48e0f80efcb6ae68e579.tar.bz2 shiftos_thereturn-d8004332b61bb310321b48e0f80efcb6ae68e579.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ShiftOS_TheReturn/SaveSystem.cs
Diffstat (limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj')
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 1607ae9..411d701 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -323,6 +323,12 @@ <DependentUpon>DownloadControl.cs</DependentUpon> </Compile> <Compile Include="GUIFunctions.cs" /> + <Compile Include="GUILogin.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="GUILogin.Designer.cs"> + <DependentUpon>GUILogin.cs</DependentUpon> + </Compile> <Compile Include="HackerCommands.cs" /> <Compile Include="IDesktopWidget.cs" /> <Compile Include="JobTasks.cs" /> @@ -520,6 +526,9 @@ <EmbeddedResource Include="DownloadControl.resx"> <DependentUpon>DownloadControl.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="GUILogin.resx"> + <DependentUpon>GUILogin.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Oobe.resx"> <DependentUpon>Oobe.cs</DependentUpon> </EmbeddedResource> |