Merge branch 'master' of git://github.com/github/linguist

This commit is contained in:
marc hoffman
2013-04-27 22:57:33 +02:00
12 changed files with 1176 additions and 5 deletions

View File

@@ -1291,6 +1291,14 @@ TypeScript:
- ts
primary_extension: .ts
Unified Parallel C:
type: programming
group: C
lexer: C
ace_mode: c_cpp
color: "#755223"
primary_extension: .upc
VHDL:
type: programming
lexer: vhdl