KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2026-01-24 10:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1142

Browse Source 
Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-05-02 13:18:47 -05:00
parent 00873da7a6 49e27387b7
commit 0e6a46abfc
5 changed files with 52413 additions and 52243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/linguist/languages.yml
View File

@@ -659,6 +659,7 @@ Frege:
Game Maker Language:
type: programming
color: "#8ad353"
lexer: JavaScript
primary_extension: .gml
@@ -1394,7 +1395,7 @@ PAWN:
PHP:
type: programming
ace_mode: php
color: "#6e03c1"
color: "#4F5D95"
primary_extension: .php
extensions:
- .aw

104568
lib/linguist/samples.json
View File

File diff suppressed because it is too large Load Diff