Merge branch 'master' into prolog-grammar

This commit is contained in:
Paul Chaignon
2015-08-19 20:46:15 +02:00
20 changed files with 135 additions and 16 deletions

3
.gitmodules vendored
View File

@@ -671,3 +671,6 @@
[submodule "vendor/grammars/sublimeprolog"]
path = vendor/grammars/sublimeprolog
url = https://github.com/alnkpa/sublimeprolog
[submodule "vendor/grammars/sublime-aspectj"]
path = vendor/grammars/sublime-aspectj
url = https://github.com/pchaigno/sublime-aspectj