Merge branch 'master' of https://github.com/github/linguist into add-ox

This commit is contained in:
Christian Bundy
2014-05-30 15:33:51 -07:00
13 changed files with 1300 additions and 146 deletions

View File

@@ -293,6 +293,7 @@ C++:
- .inl
- .tcc
- .tpp
- .ipp
C-ObjDump:
type: data
@@ -819,6 +820,9 @@ Groovy:
color: "#e69f56"
extensions:
- .groovy
- .grt
- .gtpl
- .gvy
interpreters:
- groovy
@@ -907,7 +911,7 @@ Haskell:
Haxe:
type: programming
ace_mode: haxe
color: "#346d51"
color: "#f7941e"
extensions:
- .hx
- .hxsl
@@ -1059,6 +1063,7 @@ JavaScript:
- ._js
- .bones
- .es6
- .frag
- .jake
- .jsfl
- .jsm
@@ -1250,6 +1255,7 @@ Markdown:
- .md
- .markdown
- .mkd
- .mkdn
- .mkdown
- .ron
@@ -1707,6 +1713,8 @@ R:
extensions:
- .r
- .R
- .Rd
- .rd
- .rsx
filenames:
- .Rprofile
@@ -1851,6 +1859,13 @@ Rust:
extensions:
- .rs
SAS:
type: programming
color: "#1E90FF"
lexer: Text only
extensions:
- .sas
SCSS:
type: markup
group: CSS
@@ -2209,6 +2224,7 @@ XML:
- .clixml
- .cproject
- .csproj
- .ct
- .dita
- .ditamap
- .ditaval

File diff suppressed because it is too large Load Diff