Merge branch 'master' into updated-922

Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-04-21 10:51:42 -05:00
5 changed files with 261 additions and 3 deletions

View File

@@ -1082,6 +1082,11 @@ Mask:
ace_mode: scss
primary_extension: .mask
Mathematica:
type: programming
primary_extension: .mathematica
lexer: Text only
Matlab:
type: programming
color: "#bb92ac"