Merge remote-tracking branch 'forkorigin/master' into detect-nemerle-language

Conflicts:
	lib/linguist/mimes.yml
	test/test_blob.rb
This commit is contained in:
Alex Zimin
2011-07-09 00:16:19 +08:00
4 changed files with 7 additions and 1 deletions

View File

@@ -293,8 +293,11 @@ class TestBlob < Test::Unit::TestCase
# https://github.com/googleapi/googleapi/blob/master/demos/gmail_demo/gmail.dpr
assert_equal Language['Delphi'], blob("program.dpr").language
# https://github.com/philiplaureano/Nemerle.FizzBuzz/blame/master/FizzBuzz/FizzBuzzer.n
# https://github.com/philiplaureano/Nemerle.FizzBuzz/blob/master/FizzBuzz/FizzBuzzer.n
assert_equal Language['Nemerle'], blob("hello.n").language
# https://github.com/dharmatech/agave/blob/master/demos/asteroids.sps
assert_equal Language['Scheme'], blob("asteroids.sps").language
end
def test_lexer