Merge branch 'master' into licensee

Browse Source

...

This commit is contained in:

Ben Balter

2015-08-20 15:25:15 -04:00

parent 62a0faa729 b3b75e5ef8

commit d1f90d61c5

10 changed files with 42 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1

vendor/grammars/sublime-typescript vendored Submodule

Submodule vendor/grammars/sublime-typescript added at 0d519e5a55

1

vendor/grammars/sublimeprolog vendored Submodule

Submodule vendor/grammars/sublimeprolog added at 9fd46df4b6