Merge branch 'master' into new-grammars

This commit is contained in:
Paul Chaignon
2015-02-09 23:19:37 +01:00
8 changed files with 14 additions and 5 deletions

View File

@@ -346,6 +346,8 @@ vendor/grammars/matlab.tmbundle:
- source.octave
vendor/grammars/maven.tmbundle:
- text.xml.pom
vendor/grammars/mediawiki.tmbundle/:
- text.html.mediawiki
vendor/grammars/mercury-tmlanguage:
- source.mercury
vendor/grammars/monkey.tmbundle: