Merge branch 'master' into add-missing-ace-modes-for-popular-languages

This commit is contained in:
Garen Torikian
2014-12-04 21:09:46 +02:00
11 changed files with 825 additions and 4 deletions

View File

@@ -137,9 +137,9 @@ module Linguist
disambiguate "F#", "Forth", "GLSL" do |data|
if /^(: |new-device)/.match(data)
Language["Forth"]
elsif /^(#light|import|let|module|namespace|open|type)/.match(data)
elsif /^\s*(#light|import|let|module|namespace|open|type)/.match(data)
Language["F#"]
elsif /^(#include|#pragma|precision|uniform|varying|void)/.match(data)
elsif /^\s*(#include|#pragma|precision|uniform|varying|void)/.match(data)
Language["GLSL"]
end
end

View File

@@ -1,3 +1,3 @@
module Linguist
VERSION = "4.2.1"
VERSION = "4.2.3"
end