Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitmodules
This commit is contained in:
Steinway Wu
2015-01-31 17:24:23 -05:00
23 changed files with 5712 additions and 16 deletions

View File

@@ -46,6 +46,8 @@ vendor/grammars/Julia.tmbundle:
- source.julia
vendor/grammars/LiveScript.tmbundle:
- source.livescript
vendor/grammars/Modelica/:
- source.modelica
vendor/grammars/NSIS:
- source.nsis
vendor/grammars/NimLime: