Merge branch 'master' into 1239-update

Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-06-02 21:01:00 -05:00
46 changed files with 637 additions and 4 deletions

View File

@@ -2046,6 +2046,12 @@ SuperCollider:
extensions:
- .scd
Swift:
type: programming
lexer: Text only
extensions:
- .swift
SystemVerilog:
type: programming
color: "#343761"