Merge branch 'master' into 2171-local

This commit is contained in:
Arfon Smith
2015-02-26 21:13:18 -06:00
16 changed files with 1441 additions and 4 deletions

3
.gitmodules vendored
View File

@@ -633,3 +633,6 @@
[submodule "vendor/grammars/openscad.tmbundle"]
path = vendor/grammars/openscad.tmbundle
url = https://github.com/tbuser/openscad.tmbundle
[submodule "vendor/grammars/sublime-varnish"]
path = vendor/grammars/sublime-varnish
url = https://github.com/brandonwamboldt/sublime-varnish