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, 13 insertions, 13 deletions

diff --git a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
index 8c837c3165..88dfbd28b5 100644
--- a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
+++ b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
@@ -15,7 +15,7 @@
 		<Addin id="Deployment" version="4.0"/>

 		<Addin id="AspNet" version="4.0" />

 	</Dependencies>

-	

+

 	<Runtime>

 		<Import file="Templates/Silverlight.js" />

 	</Runtime>

@@ -26,7 +26,7 @@
 		<FileTemplate id       = "Moonlight-UserControlXaml"

 		              resource = "Moonlight-UserControlXaml.xft.xml"/>

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">

 		<DotNetProjectSubtype id="Moonlight"

 			guid="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}"

@@ -35,42 +35,42 @@
 			<RemoveImport language="C#" projects="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

 		</DotNetProjectSubtype>

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">

 		<ProjectTemplate id = "Moonlight-ApplicationProject" resource = "Moonlight-ApplicationProject.xpt.xml"/>

 		<ProjectTemplate id = "Moonlight-LibraryProject"     resource = "Moonlight-LibraryProject.xpt.xml"/>

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/Ide/FileFilters">

 		<FileFilter id = "XamlFiles"

 		            insertbefore = "AllFiles"

 		           _label = "XAML Files"

 		           extensions = "*.xaml" />

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/ProjectModel/ProjectBindings">

 		<ProjectBinding id = "MoonlightProject" class = "MonoDevelop.Moonlight.MoonlightProjectBinding" />

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">

 		<DataType class = "MonoDevelop.Moonlight.MoonlightProject" />

 		<DataType class = "MonoDevelop.Moonlight.MoonlightProjectConfiguration" />

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/Core/MimeTypes">

 		<MimeType id="application/xaml+xml" _description="XAML document" icon="md-xml-file-icon"  isText="true">

 			<File pattern="*.xaml" />

 		</MimeType>

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/TypeSystem/Parser">

 		<Parser class = "MonoDevelop.Moonlight.MoonlightParser" insertbefore="XmlParser" mimeType="application/xaml+xml" />

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">

 		<Class fileExtensions = ".xaml" class = "MonoDevelop.Moonlight.MoonlightEditorExtension" />

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build">

 		<Condition id="ItemType" value="MonoDevelop.Moonlight.MoonlightProject">

 			<Section id = "MoonlightOptions"

@@ -78,13 +78,13 @@
 			         class = "MonoDevelop.Moonlight.Gui.MoonlightOptionsPanel"/>

 		</Condition>

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">

 		<Condition id="ItemType" value="MonoDevelop.Moonlight.MoonlightProject">

 			<Class class = "MonoDevelop.Moonlight.MoonlightBuildExtension" insertafter="MidStep" />

 		</Condition>

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/Core/Frameworks">

 		<Framework id="SL2.0" file="Templates/framework_SL_2_0.xml">

 			<Backend class="MonoDevelop.Moonlight.MoonlightFrameworkBackend" />

@@ -96,7 +96,7 @@
 			<Backend class="MonoDevelop.Moonlight.MoonlightFrameworkBackend" />

 		</Framework>

 	</Extension>

-	

+

 	<Extension path = "/MonoDevelop/Core/ExecutionHandlers">

 		<ExecutionHandler id="Moonlight" class = "MonoDevelop.Moonlight.MoonlightExecutionHandler"/>

 	</Extension>