Merge remote-tracking branch 'upstream/master' into plsql

Conflicts:
	.gitmodules
This commit is contained in:
David Pyke Le Brun
2015-02-09 12:04:21 +00:00
11 changed files with 201 additions and 193 deletions

View File

@@ -51,6 +51,8 @@ vendor/grammars/Handlebars:
- text.html.handlebars
vendor/grammars/IDL-Syntax:
- source.webidl
vendor/grammars/InnoSetup/:
- source.inno
vendor/grammars/Isabelle.tmbundle:
- source.isabelle.root
- source.isabelle.theory
@@ -336,6 +338,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: