diff options
| author | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
|---|---|---|
| committer | Michael VanOverbeek <[email protected]> | 2016-07-25 12:54:08 -0400 |
| commit | 6fa16209519896de09949a27425dff00ebf2970a (patch) | |
| tree | f00af7ea3f6ad2641fb26fa1d310fd8b7179b39c /source/WindowsFormsApplication1/ShiftOS.csproj | |
| parent | 401ae1bb353887a2b90a3dbf53b8913dc84d70a9 (diff) | |
| parent | af48e774189596b8d7a058c564a7d6d75205ca03 (diff) | |
| download | shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.gz shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.tar.bz2 shiftos-c--6fa16209519896de09949a27425dff00ebf2970a.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master' into shiftui_integration
Diffstat (limited to 'source/WindowsFormsApplication1/ShiftOS.csproj')
| -rw-r--r-- | source/WindowsFormsApplication1/ShiftOS.csproj | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/source/WindowsFormsApplication1/ShiftOS.csproj b/source/WindowsFormsApplication1/ShiftOS.csproj index f9d4198..6004cfc 100644 --- a/source/WindowsFormsApplication1/ShiftOS.csproj +++ b/source/WindowsFormsApplication1/ShiftOS.csproj @@ -85,6 +85,12 @@ </ItemGroup> <ItemGroup> <Compile Include="API.cs" /> + <Compile Include="Apps\About.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="Apps\About.Designer.cs"> + <DependentUpon>About.cs</DependentUpon> + </Compile> <Compile Include="Apps\Appscape.cs"> <SubType>Form</SubType> </Compile> @@ -219,17 +225,17 @@ <Compile Include="Dialogs\Graphic_Picker.Designer.cs"> <DependentUpon>Graphic_Picker.cs</DependentUpon> </Compile> - <Compile Include="Gameplay\Hacking.cs" /> - <Compile Include="Gameplay\HackUI.cs"> + <Compile Include="Hacking\Hacking.cs" /> + <Compile Include="Hacking\HackUI.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="Gameplay\HackUI.Designer.cs"> + <Compile Include="Hacking\HackUI.Designer.cs"> <DependentUpon>HackUI.cs</DependentUpon> </Compile> - <Compile Include="Gameplay\HijackScreen.cs"> + <Compile Include="Hacking\HijackScreen.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="Gameplay\HijackScreen.Designer.cs"> + <Compile Include="Hacking\HijackScreen.Designer.cs"> <DependentUpon>HijackScreen.cs</DependentUpon> </Compile> <Compile Include="Apps\HoloChat.cs"> @@ -398,6 +404,9 @@ <DependentUpon>WindowBorder.cs</DependentUpon> </Compile> <Compile Include="SkinEngine\WindowComposition.cs" /> + <EmbeddedResource Include="Apps\About.resx"> + <DependentUpon>About.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Apps\Appscape.resx"> <DependentUpon>Appscape.cs</DependentUpon> </EmbeddedResource> @@ -461,10 +470,10 @@ <EmbeddedResource Include="Dialogs\Graphic_Picker.resx"> <DependentUpon>Graphic_Picker.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="Gameplay\HackUI.resx"> + <EmbeddedResource Include="Hacking\HackUI.resx"> <DependentUpon>HackUI.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="Gameplay\HijackScreen.resx"> + <EmbeddedResource Include="Hacking\HijackScreen.resx"> <DependentUpon>HijackScreen.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="Apps\HoloChat.resx"> @@ -857,7 +866,6 @@ <None Include="Resources\dodge.png" /> <None Include="Resources\downarrow.png" /> <None Include="Resources\downloadmanagericon.png" /> - <None Include="Resources\DSC01042.JPG" /> <None Include="Resources\fileiconsaa.png" /> <None Include="Resources\fileskimmericon.fw.png" /> <None Include="Resources\floodgateicn.png" /> |