Merge remote-tracking branch 'forkorigin/master' into detect-nemerle-language

Conflicts: lib/linguist/mimes.yml test/test_blob.rb
2025-10-29 17:50:22 +00:00 · 2011-07-09 00:16:19 +08:00
parent 41dc2d027a e56f04bc81
commit 8d5232be6b
4 changed files with 7 additions and 1 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -495,6 +495,7 @@ Markdown:
  - .ron

 Matlab:
+  type: programming
  extensions:
  - .m
  - .matlab
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -55,3 +55,4 @@ text/plain @cu,cxx
 text/x-nimrod @nim
 text/x-ocaml @ml,mli,mll,mly,sig,sml
 text/x-nemerle @n
+text/x-scheme @rkt,scm,sls,sps,ss