aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Engine
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-04-24 12:14:14 -0400
committerlempamo <[email protected]>2017-04-24 12:14:14 -0400
commit9e48a71e65b4c56eae2e7b7f6535b4b115955612 (patch)
tree26f636eb3b265fbafc7c90f3cd2a8575cbcce3ff /TimeHACK.Engine
parent29f9b993345d8ae0b20328786eaa25e7ae0ceb55 (diff)
parenta2a3dc079d5623fda5f0c5ecd846b9ed0ffaa155 (diff)
downloadhistacom2-9e48a71e65b4c56eae2e7b7f6535b4b115955612.tar.gz
histacom2-9e48a71e65b4c56eae2e7b7f6535b4b115955612.tar.bz2
histacom2-9e48a71e65b4c56eae2e7b7f6535b4b115955612.zip
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
Diffstat (limited to 'TimeHACK.Engine')
-rw-r--r--TimeHACK.Engine/Resources/WinClassic/Window/pjBg6mKP.binbin0 -> 4997267 bytes
-rw-r--r--TimeHACK.Engine/TimeHACK.Engine.csproj1
-rw-r--r--TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cachebin868 -> 868 bytes
-rw-r--r--TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cachebin8959 -> 9050 bytes
4 files changed, 1 insertions, 0 deletions
diff --git a/TimeHACK.Engine/Resources/WinClassic/Window/pjBg6mKP.bin b/TimeHACK.Engine/Resources/WinClassic/Window/pjBg6mKP.bin
new file mode 100644
index 0000000..80948b4
--- /dev/null
+++ b/TimeHACK.Engine/Resources/WinClassic/Window/pjBg6mKP.bin
Binary files differ
diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj
index 2ec37f8..c9c9c1b 100644
--- a/TimeHACK.Engine/TimeHACK.Engine.csproj
+++ b/TimeHACK.Engine/TimeHACK.Engine.csproj
@@ -46,6 +46,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="BSODCreator.cs" />
+ <None Include="Resources\WinClassic\Window\pjBg6mKP.bin" />
<Compile Include="Template\Win9XBSOD.cs">
<SubType>Form</SubType>
</Compile>
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 22cb9e6..59b6a5c 100644
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
+++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 396008f..6b2e418 100644
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ