Merge branch 'master' into puppet-augeas-lexers

This commit is contained in:
Tim Sharpe
2012-04-09 11:49:01 -07:00
4 changed files with 59 additions and 1 deletions

View File

@@ -304,6 +304,16 @@ Delphi:
- .lpr
- .pas
DCPU-16 Assembly:
type: programming
lexer: dasm16
primary_extension: .dasm16
extensions:
- .dasm
- .dasm16
aliases:
- dasm16
Diff:
extensions:
- .diff
@@ -604,6 +614,13 @@ JavaScript:
filenames:
- Jakefile
Julia:
type: programming
lexer: Julia
primary_extension: .jl
extensions:
- .jl
Kotlin:
type: programming
lexer: Kotlin