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

3
.gitmodules vendored
View File

@@ -558,3 +558,6 @@
[submodule "vendor/grammars/ats.sublime"]
path = vendor/grammars/ats.sublime
url = https://github.com/steinwaywhw/ats-mode-sublimetext
[submodule "vendor/grammars/Modelica"]
path = vendor/grammars/Modelica
url = https://github.com/BorisChumichev/modelicaSublimeTextPackage