Merge branch 'master' into 780-update

Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-05-03 17:11:13 -05:00
7 changed files with 642 additions and 12 deletions

View File

@@ -1658,6 +1658,14 @@ Rebol:
- .r3
- .rebol
Red:
type: programming
lexer: Text only
color: "#ee0000"
primary_extension: .red
extensions:
- .reds
Redcode:
primary_extension: .cw