Merge branch 'master' into cut-release-v4.2.4

This commit is contained in:
Arfon Smith
2014-12-17 15:37:46 -08:00
4 changed files with 65 additions and 36 deletions

View File

@@ -1725,7 +1725,7 @@ Markdown:
- .mkdn
- .mkdown
- .ron
tm_scope: text.html.markdown
tm_scope: source.gfm
Mask:
type: markup
@@ -3057,7 +3057,7 @@ WebIDL:
type: programming
extensions:
- .webidl
tm_scope: source.webidl
tm_scope: none
ace_mode: text
XC: