aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/Properties
diff options
context:
space:
mode:
authorAlex-TIMEHACK <[email protected]>2017-07-22 09:07:54 +0100
committerAlex-TIMEHACK <[email protected]>2017-07-22 09:07:54 +0100
commit9cf2ebcd75282eca80c93eac759bf84561c2e8f5 (patch)
tree6aa3598785465ed18cad88c238a38a1f611570df /TimeHACK.Main/Properties
parent4db6df01a8ee3f40c13b67174c6acc498a060951 (diff)
parent845d40b0b9cd3ed2d14016a7d3cb5ce5a521a369 (diff)
downloadhistacom2-9cf2ebcd75282eca80c93eac759bf84561c2e8f5.tar.gz
histacom2-9cf2ebcd75282eca80c93eac759bf84561c2e8f5.tar.bz2
histacom2-9cf2ebcd75282eca80c93eac759bf84561c2e8f5.zip
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
Diffstat (limited to 'TimeHACK.Main/Properties')
-rw-r--r--TimeHACK.Main/Properties/Resources.Designer.cs20
-rw-r--r--TimeHACK.Main/Properties/Resources.resx12
2 files changed, 29 insertions, 3 deletions
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs
index ee5c4c5..7334f29 100644
--- a/TimeHACK.Main/Properties/Resources.Designer.cs
+++ b/TimeHACK.Main/Properties/Resources.Designer.cs
@@ -1024,6 +1024,26 @@ namespace TimeHACK.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
+ internal static System.Drawing.Bitmap WinClassicEndings {
+ get {
+ object obj = ResourceManager.GetObject("WinClassicEndings", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap WinClassicEndingsLocked {
+ get {
+ object obj = ResourceManager.GetObject("WinClassicEndingsLocked", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap WinClassicFileExplorer {
get {
object obj = ResourceManager.GetObject("WinClassicFileExplorer", resourceCulture);
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index cf2df35..23942a7 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -178,9 +178,6 @@
<data name="Win95ComputerIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WinClassic\Win95ComputerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="LauncherSideBar" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="TitleScreenBG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\titlescreen\titlescreenbg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -654,4 +651,13 @@
<data name="ie4about" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IE4\ie4about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="LauncherSideBar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\WinClassic\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="WinClassicEndings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\WinClassic\WinClassicEndings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="WinClassicEndingsLocked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\WinClassic\WinClassicEndingsLocked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root> \ No newline at end of file