Merge remote-tracking branch 'upstream/master'

Conflicts: .gitmodules
2025-10-29 17:50:22 +00:00 · 2015-01-31 17:24:23 -05:00
parent da7b3182e8 95d5b8bdbc
commit c2ab5bc09d
23 changed files with 5712 additions and 16 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -381,6 +381,7 @@ C++:
  - .cpp
  - .c++
  - .cc
+  - .cp
  - .cxx
  - .h
  - .h++
@@ -1838,6 +1839,13 @@ Mirah:
  tm_scope: source.ruby
  ace_mode: ruby

+Modelica:
+  type: programming
+  extensions:
+  - .mo
+  tm_scope: source.modelica
+  ace_mode: text
+
 Monkey:
  type: programming
  extensions:
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.2.7"
+  VERSION = "4.3.0"
 end