Fix conflicts from merging master into 'mod-extension'

2025-10-29 17:50:22 +00:00 · 2015-07-04 18:01:56 +02:00
parent b6ee02f313 95fce2024d
commit 8c54f68040
130 changed files with 24053 additions and 160 deletions
--- a/vendor/grammars/AutoHotkey
+++ b/vendor/grammars/AutoHotkey
--- a/vendor/grammars/Docker.tmbundle
+++ b/vendor/grammars/Docker.tmbundle
--- a/vendor/grammars/Elm.tmLanguage
+++ b/vendor/grammars/Elm.tmLanguage
--- a/vendor/grammars/Handlebars
+++ b/vendor/grammars/Handlebars
--- a/vendor/grammars/IDL-Syntax
+++ b/vendor/grammars/IDL-Syntax
--- a/vendor/grammars/InnoSetup
+++ b/vendor/grammars/InnoSetup
--- a/vendor/grammars/NimLime
+++ b/vendor/grammars/NimLime
--- a/vendor/grammars/SMT.tmbundle
+++ b/vendor/grammars/SMT.tmbundle
--- a/vendor/grammars/Sublime-Coq
+++ b/vendor/grammars/Sublime-Coq
--- a/vendor/grammars/Sublime-Red
+++ b/vendor/grammars/Sublime-Red
--- a/vendor/grammars/Sublime-SQF-Language
+++ b/vendor/grammars/Sublime-SQF-Language
--- a/vendor/grammars/SublimePapyrus
+++ b/vendor/grammars/SublimePapyrus
--- a/vendor/grammars/ada.tmbundle
+++ b/vendor/grammars/ada.tmbundle
--- a/vendor/grammars/api-blueprint-sublime-plugin
+++ b/vendor/grammars/api-blueprint-sublime-plugin
--- a/vendor/grammars/asciidoc.tmbundle
+++ b/vendor/grammars/asciidoc.tmbundle
--- a/vendor/grammars/atom-fsharp
+++ b/vendor/grammars/atom-fsharp
--- a/vendor/grammars/ats.sublime
+++ b/vendor/grammars/ats.sublime
--- a/vendor/grammars/bro-sublime
+++ b/vendor/grammars/bro-sublime
--- a/vendor/grammars/carto-atom
+++ b/vendor/grammars/carto-atom
--- a/vendor/grammars/ceylon-sublimetext
+++ b/vendor/grammars/ceylon-sublimetext
--- a/vendor/grammars/chapel-tmbundle
+++ b/vendor/grammars/chapel-tmbundle
--- a/vendor/grammars/css.tmbundle
+++ b/vendor/grammars/css.tmbundle
--- a/vendor/grammars/d.tmbundle
+++ b/vendor/grammars/d.tmbundle
--- a/vendor/grammars/dart-sublime-bundle
+++ b/vendor/grammars/dart-sublime-bundle
--- a/vendor/grammars/factor
+++ b/vendor/grammars/factor
--- a/vendor/grammars/fsharpbinding
+++ b/vendor/grammars/fsharpbinding
--- a/vendor/grammars/gap-tmbundle
+++ b/vendor/grammars/gap-tmbundle
--- a/vendor/grammars/grace-tmbundle
+++ b/vendor/grammars/grace-tmbundle
--- a/vendor/grammars/graphviz.tmbundle
+++ b/vendor/grammars/graphviz.tmbundle
--- a/vendor/grammars/haxe-sublime-bundle
+++ b/vendor/grammars/haxe-sublime-bundle
--- a/vendor/grammars/html.tmbundle
+++ b/vendor/grammars/html.tmbundle
--- a/vendor/grammars/idl.tmbundle
+++ b/vendor/grammars/idl.tmbundle
--- a/vendor/grammars/jade-tmbundle
+++ b/vendor/grammars/jade-tmbundle
--- a/vendor/grammars/javadoc.tmbundle
+++ b/vendor/grammars/javadoc.tmbundle
--- a/vendor/grammars/jquery-tmbundle
+++ b/vendor/grammars/jquery-tmbundle
--- a/vendor/grammars/language-clojure
+++ b/vendor/grammars/language-clojure
--- a/vendor/grammars/language-coffee-script
+++ b/vendor/grammars/language-coffee-script
--- a/vendor/grammars/language-csharp
+++ b/vendor/grammars/language-csharp
--- a/vendor/grammars/language-gfm
+++ b/vendor/grammars/language-gfm
--- a/vendor/grammars/language-javascript
+++ b/vendor/grammars/language-javascript
--- a/vendor/grammars/language-jsoniq
+++ b/vendor/grammars/language-jsoniq
--- a/vendor/grammars/language-python
+++ b/vendor/grammars/language-python
--- a/vendor/grammars/language-shellscript
+++ b/vendor/grammars/language-shellscript
--- a/vendor/grammars/language-yaml
+++ b/vendor/grammars/language-yaml
--- a/vendor/grammars/latex.tmbundle
+++ b/vendor/grammars/latex.tmbundle
--- a/vendor/grammars/lisp.tmbundle
+++ b/vendor/grammars/lisp.tmbundle
--- a/vendor/grammars/ocaml.tmbundle
+++ b/vendor/grammars/ocaml.tmbundle
--- a/vendor/grammars/perl.tmbundle
+++ b/vendor/grammars/perl.tmbundle
--- a/vendor/grammars/php-smarty.tmbundle
+++ b/vendor/grammars/php-smarty.tmbundle
--- a/vendor/grammars/php.tmbundle
+++ b/vendor/grammars/php.tmbundle
--- a/vendor/grammars/r.tmbundle
+++ b/vendor/grammars/r.tmbundle
--- a/vendor/grammars/ruby-on-rails-tmbundle
+++ b/vendor/grammars/ruby-on-rails-tmbundle
--- a/vendor/grammars/sas.tmbundle
+++ b/vendor/grammars/sas.tmbundle
--- a/vendor/grammars/sass-textmate-bundle
+++ b/vendor/grammars/sass-textmate-bundle
--- a/vendor/grammars/smali-sublime
+++ b/vendor/grammars/smali-sublime
--- a/vendor/grammars/sublime-better-typescript
+++ b/vendor/grammars/sublime-better-typescript
--- a/vendor/grammars/sublime-mask
+++ b/vendor/grammars/sublime-mask
--- a/vendor/grammars/sublime-netlinx
+++ b/vendor/grammars/sublime-netlinx
--- a/vendor/grammars/sublime-rust
+++ b/vendor/grammars/sublime-rust
--- a/vendor/grammars/sublime-text-ox
+++ b/vendor/grammars/sublime-text-ox
--- a/vendor/grammars/sublime_cobol
+++ b/vendor/grammars/sublime_cobol
--- a/vendor/grammars/text.tmbundle
+++ b/vendor/grammars/text.tmbundle
--- a/vendor/grammars/textile.tmbundle
+++ b/vendor/grammars/textile.tmbundle
--- a/vendor/grammars/textmate.tmbundle
+++ b/vendor/grammars/textmate.tmbundle