aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/ShiftOS.WinForms.csproj
diff options
context:
space:
mode:
authorMichael VanOverbeek <[email protected]>2017-02-26 08:37:06 -0500
committerGitHub <[email protected]>2017-02-26 08:37:06 -0500
commite1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268 (patch)
treee670f4d26dbd03f218275550aa12640f729e12b5 /ShiftOS.WinForms/ShiftOS.WinForms.csproj
parentab8c5c6f467b9ae61c27cdfb1a68c2812cb7d78f (diff)
parent3a46014d655a9d36e51fec5a6ddddde9937647e1 (diff)
downloadshiftos_thereturn-e1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268.tar.gz
shiftos_thereturn-e1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268.tar.bz2
shiftos_thereturn-e1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268.zip
Merge branch 'master' into master
Diffstat (limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj')
-rw-r--r--ShiftOS.WinForms/ShiftOS.WinForms.csproj10
1 files changed, 10 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 6fc2341..e458704 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -58,6 +58,12 @@
</Reference>
</ItemGroup>
<ItemGroup>
+ <Compile Include="Applications\About.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Applications\About.Designer.cs">
+ <DependentUpon>About.cs</DependentUpon>
+ </Compile>
<Compile Include="Applications\Artpad.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -262,6 +268,9 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WinformsWindowManager.cs" />
+ <EmbeddedResource Include="Applications\About.resx">
+ <DependentUpon>About.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Applications\Artpad.resx">
<DependentUpon>Artpad.cs</DependentUpon>
</EmbeddedResource>
@@ -518,6 +527,7 @@
</ItemGroup>
<ItemGroup>
<None Include="Resources\RegularDesktopGlyph.bmp" />
+ <None Include="Resources\justthes.png" />
<Content Include="SystemIcons\iconArtpad.png" />
<Content Include="SystemIcons\iconAudioPlayer.png" />
<Content Include="SystemIcons\iconBitnoteDigger.png" />