diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2014-07-24 15:32:44 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2014-07-24 15:32:44 +0400 |
| commit | e058e5f8314de950a734126d225e3cc6a2dbeb75 (patch) | |
| tree | 11c07dec413ecb4e2cf2fb94fb07fe69c84c9457 /main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml | |
| parent | f66e36d21ba3f26f8fcf278cf8de6595a9c8c4f3 (diff) | |
| parent | a2046b6331a271e8203df7d3d0f14500d33d60fa (diff) | |
Merge branch 'xs6' into xs6-editor
Conflicts:
main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/CommonTextEditorOptions.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml')
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml index 2b6ac6f352..0b1aae77b7 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml @@ -190,17 +190,14 @@ </ItemSet> </Extension> - <Extension path="/MonoDevelop/Ide/Fonts"> - <Font name="MessageBubbles" _displayName="Message bubbles" default="_DEFAULT_SANS" defaultMac="Lucida Grande 11" /><!-- TODO: VV: "_DEFAULT_SANS" => "Segoe UI Bold 8" --> - <Font name="MessageBubbleCounter" _displayName="Message bubbles error count" default="_DEFAULT_SANS" defaultMac="Lucida Grande Bold 11" /><!-- TODO: VV: "_DEFAULT_SANS" => "Segoe UI Bold 8" --> - <Font name="MessageBubbleTooltip" _displayName="Message bubbles tooltip" default="_DEFAULT_SANS" defaultMac="Lucida Grande Bold 11" /><!-- TODO: VV: "_DEFAULT_SANS" => "Segoe UI Bold 8" --> - <Font name="LanguageTooltips" _displayName="Editor tooltips" default="_DEFAULT_SANS" /><!-- TODO: VV: "_DEFAULT_SANS" => "Segoe UI Bold 8" --> - </Extension> - <Extension path = "/MonoDevelop/SourceEditor2/EditorFactory"> <Class id = "SourceEditor" class="MonoDevelop.SourceEditor.EditorFactory" /> </Extension> + <Extension path = "/MonoDevelop/Ide/TextEditorExtensions"> + <Class fileExtensions = ".json" class = "MonoDevelop.SourceEditor.JSon.JSonTextEditorExtension" /> + </Extension> + <!-- <Extension path = "/MonoDevelop/Ide/TextEditorExtensions"> <Class fileExtensions = ".json" class = "MonoDevelop.SourceEditor.JSon.JSonTextEditorExtension" /> |