Merge branch 'master' into 891-update

Conflicts: lib/linguist/samples.json
2025-12-08 20:38:47 +00:00 · 2014-04-21 11:09:06 -05:00
parent 20c9ed9f36 40f4c49ba9
commit 5af528184d
17 changed files with 9800 additions and 4 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -626,6 +626,11 @@ Forth:
  extensions:
  - .4th

+Game Maker Language:
+  type: programming
+  lexer: JavaScript
+  primary_extension: .gml
+
 GAS:
  type: programming
  group: Assembly