Merge branch 'master' into obj_cpp

Conflicts: lib/linguist/samples.json
2026-01-07 09:55:32 +00:00 · 2014-04-21 11:51:50 -05:00
parent 142dcd27e5 2f01a4bd78
commit 715732bb93
43 changed files with 2712 additions and 3 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -719,6 +719,16 @@ Gosu:
  color: "#82937f"
  primary_extension: .gs

+Grammatical Framework:
+  type: programming
+  lexer: Haskell
+  aliases:
+  - gf
+  wrap: false
+  primary_extension: .gf
+  searchable: true
+  color: "#ff0000"
+
 Groff:
  primary_extension: .man
  extensions: