Merge branch 'pr/411' into obj_cpp

Conflicts: lib/linguist/samples.json
2026-01-05 17:05:34 +00:00 · 2014-01-03 14:11:49 -06:00
parent cd6c315fc8 395f4375da
commit 49fd25236e
4 changed files with 41337 additions and 38426 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1115,8 +1115,14 @@ Objective-C:
  - obj-c
  - objc
  primary_extension: .m
-  extensions:
-  - .mm
+
+Objective-C++:
+  type: programming
+  color: "#4886FC"
+  aliases:
+  - obj-c++
+  - objc++
+  primary_extension: .mm

 Objective-J:
  type: programming