it compiles

2010-02-18 17:10:15 +13:00
parent 3e3276682c
commit cf8a2dd50f
9 changed files with 78 additions and 23 deletions
--- a/OpenRa.Game/MainWindow.cs
+++ b/OpenRa.Game/MainWindow.cs
@@ -57,7 +57,6 @@ namespace OpenRa
 	//        StartPosition = FormStartPosition.Manual;
 	//        Location = Point.Empty;
 	//        Visible = true;
->>>>>>> origin/glfw:OpenRa.Game/MainWindow.cs
 			
 	//        while (!File.Exists("redalert.mix"))
 	//        {