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

6
.gitmodules vendored
View File

@@ -594,6 +594,12 @@
[submodule "vendor/grammars/ec.tmbundle"]
path = vendor/grammars/ec.tmbundle
url = https://github.com/ecere/ec.tmbundle
[submodule "vendor/grammars/InnoSetup"]
path = vendor/grammars/InnoSetup
url = https://github.com/idleberg/InnoSetup-Sublime-Text
[submodule "vendor/grammars/mediawiki.tmbundle"]
path = vendor/grammars/mediawiki.tmbundle
url = https://github.com/textmate/mediawiki.tmbundle
[submodule "vendor/grammars/oracle.tmbundle"]
path = vendor/grammars/oracle.tmbundle
url = https://github.com/mulander/oracle.tmbundle.git