diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2014-07-14 12:04:53 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2014-07-14 12:04:53 +0400 |
| commit | 1ea60e7b0698134f8102e434b97b688753706033 (patch) | |
| tree | f5bd6c2d217ff77bea9eacb4e8e6b4d0dc44632a /main/src/addins/MonoDevelop.RegexToolkit | |
| parent | 25c2ccd38e7784d602926a84423e2a32fce21be4 (diff) | |
| parent | 9637324a98d64cdab7e43a127810bca5804854db (diff) | |
Merge branch 'xs6' into retina-editor
Conflicts:
main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/CommandHandlers.cs
main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/StateEngine/RazorDom.cs
main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs
main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/WebTypeManager.cs
main/src/addins/AspNet/Projects/AspNetAppProject.cs
main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs
main/src/addins/AspNet/Razor/RazorCSharpParser.cs
main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs
main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs
main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs
main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs
main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs
main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs
main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
main/src/addins/Xml/Completion/XmlCompletionData.cs
main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
main/src/addins/Xml/Editor/XmlEditorService.cs
main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.RegexToolkit')
| -rw-r--r-- | main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj index b660d9901a..ab4c494c63 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj +++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj @@ -9,6 +9,7 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.RegexToolkit</AssemblyName> <RootNamespace>MonoDevelop.RegexToolkit</RootNamespace> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> |