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

Resolves conflicts:
	.gitmodules
This commit is contained in:
Alhadis
2016-05-29 15:54:46 +10:00
16 changed files with 896 additions and 0 deletions

View File

@@ -345,6 +345,10 @@ vendor/grammars/language-csharp:
- source.cs
- source.csx
- source.nant-build
vendor/grammars/language-csound:
- source.csound
- source.csound-document
- source.csound-score
vendor/grammars/language-gfm:
- source.gfm
vendor/grammars/language-graphql: