move Activity from OpenRA.Traits.Activities namespace to OpenRA.Traits

OpenRA.Game/Traits/Activity.cs

@@ -1,9 +1,19 @@
-using System;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Traits
 {
 	public abstract class Activity
 	{

OpenRA.Game/Traits/Util.cs

@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Support;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {