Updated my fork!

Conflicts:
	ShiftOS.Engine/ShiftOS.Engine.csproj
	ShiftOS.Engine/Terminal/Commands/Hello.cs
	ShiftOS.Engine/Terminal/TerminalBackend.cs
	ShiftOS.Engine/Terminal/TerminalCommand.cs
	ShiftOS.Main/ShiftOS.Main.csproj
	ShiftOS.Main/ShiftOS/Apps/Terminal.cs
	ShiftOS.Main/ShiftOS/Desktop.cs

1 files changed, 0 insertions, 31 deletions

diff --git a/ShiftOS.Engine/Tools.cs b/ShiftOS.Engine/Tools.cs
deleted file mode 100644
index 792ccef..0000000
--- a/ShiftOS.Engine/Tools.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Runtime.InteropServices;
-
-namespace ShiftOS.Engine
-{
-	/// <summary>
-	/// Random class full of unassorted [but also uncategorizable] tools.
-	/// </summary>
-	public static class Tools
-	{
-		public static Random Rnd = new Random();
-
-		[DllImport("user32.dll", CharSet = CharSet.Auto)]
-		public extern static bool DestroyIcon(IntPtr handle);
-
-		public static Icon ToIcon(this Bitmap bm)
-		{
-			Icon tempicon = Icon.FromHandle(bm.GetHicon());
-
-			Icon newIcon = tempicon.Clone() as Icon;
-
-			//for some reason this exists
-			DestroyIcon(tempicon.Handle);
-
-			return newIcon;
-		}
-	}
-}