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/MonoDevelop.AssemblyBrowser | |
| 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/MonoDevelop.AssemblyBrowser')
| -rw-r--r-- | main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml index b10a467d37..e75e13292b 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml @@ -6,12 +6,12 @@ url = "" description = "Provides an assembly browser for the MonoDevelop" category = "IDE extensions" - version = "2.6"> + version = "2.7"> <Dependencies> - <Addin id="Core" version="2.6"/> - <Addin id="Ide" version="2.6"/> - <Addin id="Refactoring" version="2.6"/> + <Addin id="Core" version="2.7"/> + <Addin id="Ide" version="2.7"/> + <Addin id="Refactoring" version="2.7"/> </Dependencies> <!-- Extension points --> |