Merge branch 'master' into newresolver

Conflicts:
	main/contrib/ICSharpCode.NRefactory/CSharp/Parser/mcs/cs-parser.cs
	main/src/addins/CSharpBinding/CSharpBinding.addin.xml
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/DomTypeProxy.cs
	main/src/core/MonoDevelop.Ide/Makefile.am
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj

2 files changed, 11 insertions, 11 deletions

diff --git a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs
index de66beca97..e3d2e8aa93 100644
--- a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs
@@ -34,7 +34,7 @@ namespace MonoDevelop.Moonlight.Gui
 		private global::Gtk.VBox vbox6;
 		private global::Gtk.CheckButton validateXamlCheck;
 		private global::Gtk.CheckButton throwXamlErrorsCheck;
-
+		
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
diff --git a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs
index 75935e2e55..8d3a3ae5d9 100644
--- a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs
@@ -5,7 +5,7 @@ namespace Stetic
 	internal class Gui
 	{
 		private static bool initialized;
-
+		
 		internal static void Initialize (Gtk.Widget iconRenderer)
 		{
 			if ((Stetic.Gui.initialized == false)) {
@@ -13,12 +13,12 @@ namespace Stetic
 			}
 		}
 	}
-
+	
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
 		private Gtk.UIManager uimanager;
-
+		
 		public static BinContainer Attach (Gtk.Bin bin)
 		{
 			BinContainer bc = new BinContainer ();
@@ -27,32 +27,32 @@ namespace Stetic
 			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
 			return bc;
 		}
-
+		
 		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
 		{
 			if ((this.child != null)) {
 				args.Requisition = this.child.SizeRequest ();
 			}
 		}
-
+		
 		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
 		{
 			if ((this.child != null)) {
 				this.child.Allocation = args.Allocation;
 			}
 		}
-
+		
 		private void OnAdded (object sender, Gtk.AddedArgs args)
 		{
 			this.child = args.Widget;
 		}
-
+		
 		public void SetUiManager (Gtk.UIManager uim)
 		{
 			this.uimanager = uim;
 			this.child.Realized += new System.EventHandler (this.OnRealized);
 		}
-
+		
 		private void OnRealized (object sender, System.EventArgs args)
 		{
 			if ((this.uimanager != null)) {
@@ -65,14 +65,14 @@ namespace Stetic
 			}
 		}
 	}
-
+	
 	internal class ActionGroups
 	{
 		public static Gtk.ActionGroup GetActionGroup (System.Type type)
 		{
 			return Stetic.ActionGroups.GetActionGroup (type.FullName);
 		}
-
+		
 		public static Gtk.ActionGroup GetActionGroup (string name)
 		{
 			return null;