Merge branch 'master' into click

This commit is contained in:
Paul Chaignon
2015-12-08 22:00:49 +01:00
10 changed files with 409 additions and 2 deletions

View File

@@ -349,6 +349,8 @@ vendor/grammars/language-javascript:
vendor/grammars/language-jsoniq/:
- source.jq
- source.xq
vendor/grammars/language-maxscript:
- source.maxscript
vendor/grammars/language-ncl:
- source.ncl
vendor/grammars/language-python: