Merge branch 'master' into ui-refresh

Conflicts:
	extras/AspNetEdit/AspNetEdit.addin.xml
	extras/AspNetEdit/configure
	extras/BooBinding/BooBinding.addin.xml
	extras/BooBinding/configure
	extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
	extras/GeckoWebBrowser/configure
	extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
	extras/JavaBinding/JavaBinding.addin.xml
	extras/JavaBinding/configure
	extras/LuaBinding/LuaBinding.addin.xml
	extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
	extras/MonoDevelop.AddinAuthoring/configure
	extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
	extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
	extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
	extras/MonoDevelop.Database/configure.in
	extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
	extras/MonoDevelop.Debugger.Gdb/configure
	extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
	extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
	extras/MonoDevelop.Debugger.Mdb/configure
	extras/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
	extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
	extras/MonoDevelop.MeeGo/configure
	extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.addin.xml
	extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
	extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
	extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
	extras/MonoDevelop.Profiling/configure.in
	extras/NemerleBinding/NemerleBinding.addin.xml
	extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
	extras/PyBinding/PyBinding/PyBinding.addin.xml
	extras/PyBinding/configure
	extras/ValaBinding/ValaBinding.addin.xml
	extras/ValaBinding/configure.in
	extras/VersionControl.Subversion.Win32/VersionControl.Subversion.Win32/Manifest.addin.xml
	extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
	extras/WebKitWebBrowser/configure
	main/Main.sln
	main/build/MacOSX/release-info
	main/configure.in
	main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml
	main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml
	main/src/addins/CBinding/CBinding.addin.xml
	main/src/addins/CSharpBinding/CSharpBinding.addin.xml
	main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml
	main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
	main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
	main/src/addins/GnomePlatform/GnomePlatform.addin.xml
	main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml
	main/src/addins/MacPlatform/MacPlatform.addin.xml
	main/src/addins/MonoDevelop.AnalysisCore/MonoDevelop.AnalysisCore.addin.xml
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
	main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml
	main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
	main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
	main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
	main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
	main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
	main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
	main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
	main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml
	main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
	main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
	main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.addin.xml
	main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
	main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/PListObject.cs
	main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml
	main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeMonitor.cs
	main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeProjectTracker.cs
	main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
	main/src/addins/MonoDevelop.ProfilerGui/MonoDevelop.Profiler.addin.xml
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
	main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.addin.xml
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
	main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.addin.xml
	main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
	main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
	main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
	main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
	main/src/addins/VBNetBinding/VBNetBinding.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
	main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
	main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml
	main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
	main/src/core/MonoDevelop.Ide/BuildVariables.cs
	main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	version-checks

1 files changed, 22 insertions, 22 deletions

diff --git a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
index 3e215d35f5..d43669a148 100644
--- a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
+++ b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
@@ -12,42 +12,42 @@
 		<Addin id="Ide" version="4.0"/>
 		<Addin id="VersionControl" version="4.0"/>
 	</Dependencies>
-	
+
 	<!-- Extension Points -->
 
 	<ExtensionPoint path = "/MonoDevelop/AddinAuthoring/ContextMenu/ProjectPad/Addin">
 		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/AddinAuthoring/ContextMenu/ProjectPad/AddinReference">
 		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/AddinAuthoring/AddinRegistries">
 		<ExtensionNode name="Registry" type="MonoDevelop.AddinAuthoring.RegistryInfo" />
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/AddinAuthoring/ContextMenu/ExtensionModelPad/ExtensionPoint">
 		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/AddinAuthoring/ContextMenu/ExtensionModelPad/Extension">
 		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/AddinAuthoring/ContextMenu/ExtensionModelPad/ExtensionNode">
 		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/AddinAuthoring/ContextMenu/ExtensionModelPad/Project">
 		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
 	</ExtensionPoint>
-	
+
 	<!-- Extensions -->
-	
+
 	<Extension path = "/MonoDevelop/AddinAuthoring/AddinRegistries">
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/Commands">
 		<Command id = "MonoDevelop.AddinAuthoring.Commands.AddAddinDependency"
 			_label = "Add add-in reference..." />
@@ -75,7 +75,7 @@
 	<Extension path = "/MonoDevelop/Ide/FileTemplateTypes">
 		<FileTemplateType name = "Addin" class = "MonoDevelop.AddinAuthoring.AddinFileDescriptionTemplate"/>
 	</Extension>
-	
+
 	<Extension path="/MonoDevelop/Ide/MainMenu/Edit">
 		<CommandItem id="MonoDevelop.AddinAuthoring.Commands.AddAddinDependency" insertafter="Separator5"/>
 	</Extension>
@@ -94,7 +94,7 @@
 			<CommandItem id = "MonoDevelop.AddinAuthoring.Commands.AddAddinDependency" insertafter="MonoDevelop.Ide.Commands.ProjectCommands.AddReference"/>
 		</Condition>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
 		<NodeBuilder class = "MonoDevelop.AddinAuthoring.NodeBuilders.ReferencesFolderNodeBuilder"/>
 		<NodeBuilder class = "MonoDevelop.AddinAuthoring.NodeBuilders.AddinReferenceNodeBuilder"/>
@@ -113,32 +113,32 @@
 		<CommandItem id = "MonoDevelop.AddinAuthoring.Commands.AddAddinDependency" />
 		<CommandItem id = "MonoDevelop.AddinAuthoring.Commands.AddExtension" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/AddinAuthoring/ContextMenu/ProjectPad/AddinReference">
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/ContextMenu/ProjectPad/Add">
 		<Condition id="ItemType" value="Project">
 			<SeparatorItem insertafter = "MonoDevelop.Ide.Commands.ProjectCommands.AddFiles" />
 			<CommandItem id = "MonoDevelop.AddinAuthoring.Commands.AddExtension" />
 		</Condition>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">
 		<Class class = "MonoDevelop.AddinAuthoring.AddinProjectExtension"  insertafter="MidStep"/>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/ProjectFeatures">
 		<Class class = "MonoDevelop.AddinAuthoring.AddinFeature" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Common">
 		<Condition id="ItemType" value="DotNetProject">
 			<Section id = "AddinAuthoring" _label = "Add-in Settings" icon="md-addin" class="MonoDevelop.AddinAuthoring.AddinOptionPanel"/>
 		</Condition>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Core/StockIcons">
 		<StockIcon stockid = "md-addinauthoring-newclass" icon = "md-class|res:flare.png" size="Menu" />
 		<StockIcon stockid = "md-addinauthoring-newinterface" icon = "md-interface|res:flare.png" size="Menu" />
@@ -156,16 +156,16 @@
 		<DataType class = "MonoDevelop.AddinAuthoring.AddinProjectReference" name = "AddinReference"/>
 		<DataType class = "MonoDevelop.AddinAuthoring.ExtensionDomain" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
 		<Class class = "MonoDevelop.AddinAuthoring.CodeCompletion.CodeCompletionExtension" insertbefore="MonoDevelop.XmlEditor.XmlTextEditorExtension" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
 		<ItemProperty class = "MonoDevelop.Projects.DotNetProject"
 			name = "ExtensionDomain" type = "System.String" external="false"/>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/WorkbenchContexts/Edit">
 		<ContextPad id = "ExtensionTreePad" />
 	</Extension>
@@ -194,7 +194,7 @@
 		</ItemSet>
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/ProjectModel/PolicySets/Mono" >
 		<Policies resource="AddinXmlPolicy.xml" />
 		<Policies resource="AddinTextStylePolicy.xml" />