Merge master

This commit is contained in:
Garen Torikian
2014-12-03 20:15:55 +02:00
30 changed files with 4743 additions and 30 deletions

View File

@@ -1636,6 +1636,12 @@ LookML:
- .lookml
tm_scope: source.yaml
LoomScript:
type: programming
extensions:
- .ls
tm_scope: source.loomscript
Lua:
type: programming
ace_mode: lua
@@ -1878,11 +1884,12 @@ Nit:
Nix:
type: programming
color: "#7070ff"
extensions:
- .nix
aliases:
- nixos
tm_scope: none
tm_scope: source.nix
ace_mode: nix
Nu:
@@ -2040,7 +2047,7 @@ Oxygene:
- .oxygene
tm_scope: none
ace_mode: none
Oz:
type: programming
color: "#fcaf3e"
@@ -2067,7 +2074,6 @@ PHP:
- .aw
- .ctp
- .fcgi
- .module
- .php3
- .php4
- .php5
@@ -2161,14 +2167,17 @@ Perl6:
type: programming
color: "#0298c3"
extensions:
- .p6
- .6pl
- .6pm
- .nqp
- .p6
- .p6l
- .p6m
- .pl
- .pl6
- .pm
- .pm6
- .t
interpreters:
- perl6
tm_scope: none