diff options
| author | AShifter <[email protected]> | 2017-09-25 09:35:03 -0600 |
|---|---|---|
| committer | AShifter <[email protected]> | 2017-09-25 09:35:03 -0600 |
| commit | f5004702c46d6c99737a0519d7d6735307c7501a (patch) | |
| tree | 66be901284162cbadb10af1495e7b88fe00a24ca /ShiftOS.Main/ShiftOS.Main.csproj | |
| parent | f77811b2a73512db8c5aeeedd573640e10b74bd0 (diff) | |
| parent | 44d8d5c50749b70e93dd5ccf8718645d8c3d2fad (diff) | |
| download | shiftos-rewind-f5004702c46d6c99737a0519d7d6735307c7501a.tar.gz shiftos-rewind-f5004702c46d6c99737a0519d7d6735307c7501a.tar.bz2 shiftos-rewind-f5004702c46d6c99737a0519d7d6735307c7501a.zip | |
Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'
Diffstat (limited to 'ShiftOS.Main/ShiftOS.Main.csproj')
| -rw-r--r-- | ShiftOS.Main/ShiftOS.Main.csproj | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index d6ea600..18e842f 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -52,16 +52,22 @@ </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="ShiftOS\Apps\ShifterStuff\SelectColor.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="ShiftOS\Apps\ShifterStuff\SelectColor.Designer.cs"> + <DependentUpon>SelectColor.cs</DependentUpon> + </Compile> <Compile Include="ShiftOS\Apps\ShiftDemo.cs"> <SubType>UserControl</SubType> </Compile> <Compile Include="ShiftOS\Apps\ShiftDemo.Designer.cs"> <DependentUpon>ShiftDemo.cs</DependentUpon> </Compile> - <Compile Include="ShiftOS\Apps\Shifter.cs"> + <Compile Include="ShiftOS\Apps\ShifterStuff\Shifter.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Include="ShiftOS\Apps\Shifter.Designer.cs"> + <Compile Include="ShiftOS\Apps\ShifterStuff\Shifter.Designer.cs"> <DependentUpon>Shifter.cs</DependentUpon> </Compile> <Compile Include="ShiftOS\Apps\TestForm.cs"> @@ -83,10 +89,13 @@ <DependentUpon>Resources.resx</DependentUpon> <DesignTime>True</DesignTime> </Compile> + <EmbeddedResource Include="ShiftOS\Apps\ShifterStuff\SelectColor.resx"> + <DependentUpon>SelectColor.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="ShiftOS\Apps\ShiftDemo.resx"> <DependentUpon>ShiftDemo.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="ShiftOS\Apps\Shifter.resx"> + <EmbeddedResource Include="ShiftOS\Apps\ShifterStuff\Shifter.resx"> <DependentUpon>Shifter.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="ShiftOS\Apps\TestForm.resx"> |