KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2026-04-30 02:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into licensee-6

Browse Source
This commit is contained in:
Arfon Smith
2015-10-23 10:29:47 +01:00
parent 317219e479 a35a3e98ce
commit 932726863f
5 changed files with 14074 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -1,6 +1,5 @@
before_install: script/travis/before_install before_install: script/travis/before_install
rvm: rvm:
- 1.9.3
- 2.0.0 - 2.0.0
- 2.1 - 2.1
- 2.2 - 2.2

4
lib/linguist/languages.yml
View File

@@ -720,7 +720,7 @@ Cython:
D: D:
type: programming type: programming
color: "#fcd46d" color: "#ba595e"
extensions: extensions:
- .d - .d
- .di - .di
@@ -1328,6 +1328,7 @@ HTML+Django:
- .mustache - .mustache
- .jinja - .jinja
aliases: aliases:
- django
- html+django/jinja - html+django/jinja
- html+jinja - html+jinja
- htmldjango - htmldjango
@@ -1701,6 +1702,7 @@ KiCad:
type: programming type: programming
extensions: extensions:
- .sch - .sch
- .brd
- .kicad_pcb - .kicad_pcb
tm_scope: none tm_scope: none
ace_mode: text ace_mode: text

2
lib/linguist/version.rb
View File

@@ -1,3 +1,3 @@
module Linguist module Linguist
VERSION = "4.6.4" VERSION = "4.7.0"
end end

14069
samples/KiCad/tc14badge.brd Normal file
View File

File diff suppressed because it is too large Load Diff

2
vendor/grammars/sublime-typescript vendored

Submodule vendor/grammars/sublime-typescript updated: d80e89cbfb...a4c4b9fc79