diff options
| author | william341 <[email protected]> | 2017-06-29 13:13:45 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2017-06-29 13:13:45 -0700 |
| commit | ad387c41e7d6cc547431e88695d4723ea2dba913 (patch) | |
| tree | a68282dda40c4f0b28883241c7adcf9010f4550e /ShiftOS.WinForms/ShiftOS.WinForms.csproj | |
| parent | b4b19e7a4d203b58537f5b98214296ab52c49b2d (diff) | |
| parent | 5bebd4411bc6266cbee482a429ba794eefa8f9b6 (diff) | |
| download | shiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.tar.gz shiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.tar.bz2 shiftos_thereturn-ad387c41e7d6cc547431e88695d4723ea2dba913.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj')
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 8c1accc..92cbf28 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -71,6 +71,18 @@ <Compile Include="Applications\About.Designer.cs"> <DependentUpon>About.cs</DependentUpon> </Compile> + <Compile Include="Applications\ButtonMaster.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="Applications\ButtonMaster.Designer.cs"> + <DependentUpon>ButtonMaster.cs</DependentUpon> + </Compile> + <Compile Include="Applications\Clock.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="Applications\Clock.Designer.cs"> + <DependentUpon>Clock.cs</DependentUpon> + </Compile> <Compile Include="Applications\IconManager.cs"> <SubType>UserControl</SubType> </Compile> @@ -351,6 +363,7 @@ <Compile Include="MainMenu\MainMenu.Designer.cs"> <DependentUpon>MainMenu.cs</DependentUpon> </Compile> + <Compile Include="MissionCommands.cs" /> <Compile Include="Oobe.cs"> <SubType>Form</SubType> </Compile> @@ -395,6 +408,12 @@ <Compile Include="ShiftnetSites\ShiftGames.Designer.cs"> <DependentUpon>ShiftGames.cs</DependentUpon> </Compile> + <Compile Include="ShiftnetSites\ShiftOSOnline.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="ShiftnetSites\ShiftOSOnline.Designer.cs"> + <DependentUpon>ShiftOSOnline.cs</DependentUpon> + </Compile> <Compile Include="ShiftnetSites\ShiftSoft.cs"> <SubType>UserControl</SubType> </Compile> @@ -442,6 +461,7 @@ <Compile Include="UniteSignupDialog.Designer.cs"> <DependentUpon>UniteSignupDialog.cs</DependentUpon> </Compile> + <Compile Include="VirtualEnvironments.cs" /> <Compile Include="VisualBasicStuff.cs" /> <Compile Include="WFLanguageProvider.cs" /> <Compile Include="WidgetManager.cs" /> @@ -469,6 +489,12 @@ <EmbeddedResource Include="Applications\About.resx"> <DependentUpon>About.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="Applications\ButtonMaster.resx"> + <DependentUpon>ButtonMaster.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="Applications\Clock.resx"> + <DependentUpon>Clock.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Applications\IconManager.resx"> <DependentUpon>IconManager.cs</DependentUpon> </EmbeddedResource> @@ -621,6 +647,9 @@ <EmbeddedResource Include="ShiftnetSites\ShiftGames.resx"> <DependentUpon>ShiftGames.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="ShiftnetSites\ShiftOSOnline.resx"> + <DependentUpon>ShiftOSOnline.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="ShiftnetSites\ShiftSoft.resx"> <DependentUpon>ShiftSoft.cs</DependentUpon> </EmbeddedResource> @@ -854,6 +883,9 @@ <None Include="Resources\Ambient8.mp3" /> <None Include="Resources\Ambient9.mp3" /> <None Include="Resources\austmicrotrends.png" /> + <None Include="Resources\brute.mp3" /> + <None Include="Resources\AppscapeServerFS.txt" /> + <None Include="Resources\BlueBlueVerticalGradient.png" /> <Content Include="Resources\fileiconcf.bmp" /> <None Include="Resources\infobox.wav" /> <None Include="Resources\typesound.wav" /> @@ -865,6 +897,7 @@ <Content Include="Resources\GuessTheNumber.py" /> <None Include="Resources\mindblow.png" /> <None Include="Resources\strings_fr.txt" /> + <None Include="Resources\PebcakDevelFS.txt" /> <Content Include="SystemIcons\iconArtpad.png" /> <Content Include="SystemIcons\iconAudioPlayer.png" /> <Content Include="SystemIcons\iconBitnoteDigger.png" /> @@ -932,6 +965,7 @@ </COMReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <ProjectExtensions /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> |