Merge branch 'master' into no-language

Conflicts:
	lib/linguist/heuristics.rb
This commit is contained in:
Arfon Smith
2014-12-11 21:17:38 -06:00
13 changed files with 175 additions and 22 deletions

View File

@@ -281,6 +281,13 @@ Bison:
- .y
ace_mode: text
BitBake:
type: programming
tm_scope: none
extensions:
- .bb
ace_mode: text
BlitzBasic:
type: programming
aliases:
@@ -3028,6 +3035,13 @@ Volt:
tm_scope: source.d
ace_mode: d
WebIDL:
type: programming
extensions:
- .webidl
tm_scope: source.webidl
ace_mode: text
XC:
type: programming
extensions: