Merge branch 'master' into 2794-local

This commit is contained in:
Arfon Smith
2016-01-07 16:28:54 -05:00
38 changed files with 1152 additions and 37 deletions

View File

@@ -69,6 +69,9 @@ vendor/grammars/Lean.tmbundle:
- source.lean
vendor/grammars/LiveScript.tmbundle:
- source.livescript
vendor/grammars/MagicPython:
- source.python
- source.regexp.python
vendor/grammars/Modelica/:
- source.modelica
vendor/grammars/NSIS:
@@ -185,6 +188,8 @@ vendor/grammars/atom-fsharp/:
- source.fsharp.fsx
vendor/grammars/atom-language-purescript/:
- source.purescript
vendor/grammars/atom-language-stan/:
- source.stan
vendor/grammars/atom-salt:
- source.python.salt
- source.yaml.salt
@@ -354,8 +359,6 @@ vendor/grammars/language-maxscript:
vendor/grammars/language-ncl:
- source.ncl
vendor/grammars/language-python:
- source.python
- source.regexp.python
- text.python.console
- text.python.traceback
vendor/grammars/language-renpy: