diff options
| author | mike <mike@Caprica.local> | 2011-08-11 14:25:37 +0400 |
|---|---|---|
| committer | mike <mike@Caprica.local> | 2011-08-11 14:25:37 +0400 |
| commit | 42b9925102ac61b5358bf99fcb0b1d6861731a0e (patch) | |
| tree | 4d49c8f48cbc97537c5f15f937df5d0e3d80b5e9 /main/src/addins/ILAsmBinding | |
| parent | 02cb98cdd0fa5701868872895e7e08ff42b4a7bf (diff) | |
| parent | 68c0ecd05bf4db44b0a80095973ab7c84b367136 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/McsParser.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/AssemblyCodeCompletionDatabase.cs
Diffstat (limited to 'main/src/addins/ILAsmBinding')
| -rw-r--r-- | main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml | 6 | ||||
| -rw-r--r-- | main/src/addins/ILAsmBinding/ILAsmBinding.csproj | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml b/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml index 204b83881a..61593ae2c9 100644 --- a/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml +++ b/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml @@ -6,15 +6,15 @@ url = "http://www.monodevelop.com" description = "ILAsm Language Binding" category = "Language bindings" - version = "2.6"> + version = "2.7"> <Runtime> <Import assembly = "ILAsmBinding.dll"/> </Runtime> <Dependencies> - <Addin id="Core" version="2.6"/> - <Addin id="Ide" version="2.6"/> + <Addin id="Core" version="2.7"/> + <Addin id="Ide" version="2.7"/> </Dependencies> <Extension path = "/MonoDevelop/Ide/ProjectTemplates"> diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj index ec69aa2556..e6e752a70f 100644 --- a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj +++ b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj @@ -9,7 +9,6 @@ <OutputType>Library</OutputType> <AssemblyName>ILAsmBinding</AssemblyName> <RootNamespace>ILAsmBinding</RootNamespace> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> |