Merge branch 'master' into prolog-pl-samples

Conflicts:
	lib/linguist/languages.yml
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-09-04 15:51:30 -05:00
4 changed files with 163 additions and 3 deletions

View File

@@ -1203,6 +1203,16 @@ LLVM:
extensions:
- .ll
LSL:
type: programming
lexer: LSL
ace_mode: lsl
extensions:
- .lsl
interpreters:
- lsl
color: '#3d9970'
LabVIEW:
type: programming
lexer: Text only