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.MacDev | |
| 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.MacDev')
| -rw-r--r-- | main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs | 2 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs b/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs index 233f02effb..6a116f403a 100644 --- a/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs +++ b/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs @@ -141,7 +141,7 @@ namespace MonoDevelop.MacDev public static event Action Changed; } - class AppleSdkAboutInformation : MonoDevelop.Ide.Gui.Dialogs.IAboutInformation + class AppleSdkAboutInformation : ISystemInformationProvider { public string Description { get { diff --git a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml index 1dcce3b03d..5234cea3e3 100644 --- a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml +++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml @@ -7,7 +7,7 @@ description = "Mac Development Support for MonoDevelop" category = "Mac Development" flags = "Hidden" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import file = "icons/application-x-mono-develop-xib-16.png"/> @@ -22,11 +22,11 @@ </Runtime> <Dependencies> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Core" version="2.8.1"/> - <Addin id="MacPlatform" version="2.8.1"/> - <Addin id="DesignerSupport" version="2.8.1"/> - <Addin id="VersionControl" version="2.8.1" /> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="MacPlatform" version="2.8.2"/> + <Addin id="DesignerSupport" version="2.8.2"/> + <Addin id="VersionControl" version="2.8.2" /> </Dependencies> <ExtensionPoint path = "/MonoDevelop/MacDev/ContextMenu/ProjectPad/NativeReferenceFolder"> |