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/CBinding | |
| 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/CBinding')
| -rw-r--r-- | main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj | 1 | ||||
| -rw-r--r-- | main/src/addins/CBinding/CBinding.addin.xml | 18 | ||||
| -rw-r--r-- | main/src/addins/CBinding/CBinding.csproj | 1 |
3 files changed, 9 insertions, 11 deletions
diff --git a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj index afb61df769..36154db7f6 100644 --- a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj +++ b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj @@ -9,7 +9,6 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.CBinding.Autotools</AssemblyName> <RootNamespace>CBinding.Autotools</RootNamespace> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/main/src/addins/CBinding/CBinding.addin.xml b/main/src/addins/CBinding/CBinding.addin.xml index 41acc38ed2..87324ff616 100644 --- a/main/src/addins/CBinding/CBinding.addin.xml +++ b/main/src/addins/CBinding/CBinding.addin.xml @@ -6,16 +6,16 @@ url = "http://www.monodevelop.com" description = "C/C++ Language binding" category = "Language bindings" - version = "2.6"> + version = "2.7"> <Dependencies> - <Addin id = "Core" version = "2.6"/> - <Addin id = "Ide" version = "2.6"/> - <Addin id = "Deployment" version = "2.6"/> - <Addin id = "Deployment.Linux" version = "2.6"/> - <Addin id = "SourceEditor2" version = "2.6" /> - <Addin id = "DesignerSupport" version = "2.6" /> - <Addin id = "Refactoring" version = "2.6" /> + <Addin id = "Core" version = "2.7"/> + <Addin id = "Ide" version = "2.7"/> + <Addin id = "Deployment" version = "2.7"/> + <Addin id = "Deployment.Linux" version = "2.7"/> + <Addin id = "SourceEditor2" version = "2.7" /> + <Addin id = "DesignerSupport" version = "2.7" /> + <Addin id = "Refactoring" version = "2.7" /> </Dependencies> <Extension path = "/MonoDevelop/Core/StockIcons"> @@ -241,7 +241,7 @@ </Runtime> <Dependencies> - <Addin id = "MonoDevelop.Autotools" version = "2.6"/> + <Addin id = "MonoDevelop.Autotools" version = "2.7"/> </Dependencies> <Extension path = "/Autotools/SimpleSetups"> diff --git a/main/src/addins/CBinding/CBinding.csproj b/main/src/addins/CBinding/CBinding.csproj index 035fecc2ac..b3715c94fa 100644 --- a/main/src/addins/CBinding/CBinding.csproj +++ b/main/src/addins/CBinding/CBinding.csproj @@ -9,7 +9,6 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.CBinding</AssemblyName> <RootNamespace>CBinding</RootNamespace> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> |