diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-19 21:51:48 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-19 21:51:48 +0100 |
| commit | 43647f873b9c2cd454b0b9389b952e1b36406725 (patch) | |
| tree | c41de99a6103ad72dd449481d1153da3e1114c8b /TimeHACK.Main/TimeHACK.Main.csproj | |
| parent | 044d3dd3aa38f02693d1d2561a4276b2dc1bdd9a (diff) | |
| parent | d9fa6d11aa4889ba4538b00ef56d03da78664025 (diff) | |
| download | histacom2-43647f873b9c2cd454b0b9389b952e1b36406725.tar.gz histacom2-43647f873b9c2cd454b0b9389b952e1b36406725.tar.bz2 histacom2-43647f873b9c2cd454b0b9389b952e1b36406725.zip | |
Fixed Conflicts
Diffstat (limited to 'TimeHACK.Main/TimeHACK.Main.csproj')
| -rw-r--r-- | TimeHACK.Main/TimeHACK.Main.csproj | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index a019942..07cc0a4 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -209,6 +209,12 @@ <Compile Include="OS\Win95\Win95TaskBarItem.Designer.cs"> <DependentUpon>Win95TaskBarItem.cs</DependentUpon> </Compile> + <Compile Include="OS\Win98\Win98.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="OS\Win98\Win98.Designer.cs"> + <DependentUpon>Win98.cs</DependentUpon> + </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\Resources.Designer.cs"> @@ -225,6 +231,9 @@ <EmbeddedResource Include="NewGameDialog.resx"> <DependentUpon>NewGameDialog.cs</DependentUpon> </EmbeddedResource> + <Compile Include="UI\IProgressBar.cs"> + <SubType>Component</SubType> + </Compile> <EmbeddedResource Include="OS\Win95\Win95.resx"> <DependentUpon>Win95.cs</DependentUpon> </EmbeddedResource> @@ -264,6 +273,9 @@ <EmbeddedResource Include="OS\Win95\Win95TaskBarItem.resx"> <DependentUpon>Win95TaskBarItem.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="OS\Win98\Win98.resx"> + <DependentUpon>Win98.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> <Generator>ResXFileCodeGenerator</Generator> <SubType>Designer</SubType> @@ -363,6 +375,7 @@ <Content Include="Resources\WinClassic\WinClassicStart.png" /> <Content Include="Resources\WinClassic\WinClassicSuspend.png" /> <Content Include="Resources\WinClassic\WinClassicTaskBar.png" /> + <Content Include="Resources\WinClassic\WinClassicTaskbarItem.png" /> <Content Include="Resources\WinClassic\WinClassicTime.png" /> </ItemGroup> <ItemGroup> @@ -371,6 +384,7 @@ <Name>TimeHACK.Engine</Name> </ProjectReference> </ItemGroup> + <ItemGroup /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- 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. |