diff options
| author | Michael <[email protected]> | 2017-06-25 13:46:39 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-06-25 13:46:39 -0400 |
| commit | 5bebd4411bc6266cbee482a429ba794eefa8f9b6 (patch) | |
| tree | a68282dda40c4f0b28883241c7adcf9010f4550e /ShiftOS.WinForms/ShiftOS.WinForms.csproj | |
| parent | 8e19c8599975685410d7508b150f811dc3991f4a (diff) | |
| parent | 6f5e69bd9df3bd44c098a179458fd37ca6114685 (diff) | |
| download | shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.tar.gz shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.tar.bz2 shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ShiftOS.WinForms/ShiftOS.WinForms.csproj
Diffstat (limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj')
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 5fcf349..92cbf28 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -71,6 +71,12 @@ <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> @@ -483,6 +489,9 @@ <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> @@ -876,6 +885,7 @@ <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" /> |