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

7 files changed, 17 insertions, 17 deletions

diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
index 3b3b4a1cb8..dfbfcc0a1c 100644
--- a/main/src/addins/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
+++ b/main/src/addins/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
@@ -65,7 +65,7 @@ namespace CBinding
 		private global::Gtk.Button includePathBrowseButton;
 		private global::Gtk.Button includePathRemoveButton;
 		private global::Gtk.Label label3;
-
+		
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.CompilerPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.CompilerPanel.cs
index be3c43f1ce..56b988e4da 100644
--- a/main/src/addins/CBinding/gtk-gui/CBinding.CompilerPanel.cs
+++ b/main/src/addins/CBinding/gtk-gui/CBinding.CompilerPanel.cs
@@ -7,7 +7,7 @@ namespace CBinding
 		private global::Gtk.Table table2;
 		private global::Gtk.ComboBox compilerComboBox;
 		private global::Gtk.CheckButton useCcacheCheckBox;
-
+		
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs b/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs
index df4f869f74..4746c76530 100644
--- a/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs
+++ b/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs
@@ -24,7 +24,7 @@ namespace CBinding
 		private global::Gtk.Button removeButton;
 		private global::Gtk.Button buttonCancel;
 		private global::Gtk.Button buttonOk;
-
+		
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs
index e04affd98a..f9d2cc3f29 100644
--- a/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs
+++ b/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs
@@ -14,7 +14,7 @@ namespace CBinding
 		private global::Gtk.Label label3;
 		private global::Gtk.CheckButton parseLocalVariablesCheck;
 		private global::Gtk.CheckButton parseSystemTagsCheck;
-
+		
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.OutputOptionsPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.OutputOptionsPanel.cs
index 46ab68872e..7665ac5f53 100644
--- a/main/src/addins/CBinding/gtk-gui/CBinding.OutputOptionsPanel.cs
+++ b/main/src/addins/CBinding/gtk-gui/CBinding.OutputOptionsPanel.cs
@@ -15,7 +15,7 @@ namespace CBinding
 		private global::Gtk.Entry parametersTextEntry;
 		private global::Gtk.CheckButton externalConsoleCheckbox;
 		private global::Gtk.CheckButton pauseCheckbox;
-
+		
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs b/main/src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs
index c1a4b13353..e9d3efd665 100644
--- a/main/src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs
+++ b/main/src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs
@@ -28,7 +28,7 @@ namespace CBinding
 		private global::Gtk.ScrolledWindow scrolledwindow4;
 		private global::Gtk.TreeView cflagsTreeView;
 		private global::Gtk.Button buttonOk;
-
+		
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
diff --git a/main/src/addins/CBinding/gtk-gui/generated.cs b/main/src/addins/CBinding/gtk-gui/generated.cs
index 0ada9fc5f0..d23ef38e01 100644
--- a/main/src/addins/CBinding/gtk-gui/generated.cs
+++ b/main/src/addins/CBinding/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,7 +65,7 @@ namespace Stetic
 			}
 		}
 	}
-
+	
 	internal class IconLoader
 	{
 		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
@@ -99,14 +99,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;