Merge branch 'detect-prolog' of https://github.com/tautologico/linguist into tautologico-detect-prolog

Conflicts:
	lib/linguist/blob_helper.rb
	test/test_blob.rb
This commit is contained in:
Joshua Peek
2011-07-05 16:06:22 -05:00
7 changed files with 56 additions and 3 deletions

View File

@@ -590,6 +590,12 @@ Perl:
- .perl
- .psgi
Prolog:
major: true
extensions:
- .pro
- .prolog
Pure Data:
major: true
lexer: Text only