diff options
| author | Michael <[email protected]> | 2017-05-23 20:36:16 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-05-23 20:36:16 -0400 |
| commit | 44a4de1c173a0ab88ff3aa519b3a25888f2eff85 (patch) | |
| tree | 005bd432271a8f004cbd8762cef0727f32602829 /ShiftOS.WinForms/ShiftOS.WinForms.csproj | |
| parent | 660c42a19c831b9768d7bb6845b22474459a311e (diff) | |
| download | shiftos_thereturn-44a4de1c173a0ab88ff3aa519b3a25888f2eff85.tar.gz shiftos_thereturn-44a4de1c173a0ab88ff3aa519b3a25888f2eff85.tar.bz2 shiftos_thereturn-44a4de1c173a0ab88ff3aa519b3a25888f2eff85.zip | |
web browser + fix shiftorium merge conflict
Diffstat (limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj')
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index b74003f..9675744 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -274,6 +274,12 @@ <Compile Include="Applications\VideoPlayer.Designer.cs"> <DependentUpon>VideoPlayer.cs</DependentUpon> </Compile> + <Compile Include="Applications\WebBrowser.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="Applications\WebBrowser.Designer.cs"> + <DependentUpon>WebBrowser.cs</DependentUpon> + </Compile> <Compile Include="Applications\WidgetManagerFrontend.cs"> <SubType>UserControl</SubType> </Compile> @@ -523,6 +529,9 @@ <EmbeddedResource Include="Applications\VideoPlayer.resx"> <DependentUpon>VideoPlayer.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="Applications\WebBrowser.resx"> + <DependentUpon>WebBrowser.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Applications\WidgetManagerFrontend.resx"> <DependentUpon>WidgetManagerFrontend.cs</DependentUpon> </EmbeddedResource> |