diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-11-02 10:03:16 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-11-02 10:03:16 +0400 |
| commit | f8e9e1d90d2fb0a859c5682636ee4a8a4e20271b (patch) | |
| tree | 5beda2a492ea7e26083947f2309eb5302a85491b /main/src/addins/MonoDevelop.HexEditor | |
| parent | fc54ca49eda7af3e9c119256a3b583d03816e103 (diff) | |
| parent | b639f9d5574d8b4e6fadfd9012e111165af39643 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
Diffstat (limited to 'main/src/addins/MonoDevelop.HexEditor')
| -rw-r--r-- | main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.addin.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.addin.xml b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.addin.xml index 5a16ae93d0..452cac9d65 100644 --- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.addin.xml +++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.addin.xml @@ -6,16 +6,16 @@ url = "" description = "Provides a hex editor for MonoDevelop" category = "IDE extensions" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.HexEditor.dll"/> </Runtime> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="AssemblyBrowser" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="AssemblyBrowser" version="2.8.2"/> </Dependencies> <!-- <Extension path = "/MonoDevelop/Ide/Commands"> |