Arfon Smith 9b22b2973f Merge branch 'master' into google-apps ...

Conflicts:
	lib/linguist/heuristics.rb
	lib/linguist/samples.json

2014-11-30 21:11:59 -06:00

..

strategy

consolidate shebang logic

2014-11-27 12:18:23 -05:00

blob_helper.rb

Merge pull request #1674 from github/rework-heuristics

2014-11-18 10:43:01 -06:00

classifier.rb

docs

2014-11-27 11:40:48 -05:00

file_blob.rb

Support for multiple file extension segments

2014-11-17 14:54:22 -05:00

generated.rb

Gemfile.lock is nolonger considered generated

2014-11-17 16:31:47 -06:00

grammars.rb

Add github-linguist-grammars gem

2014-11-13 11:03:53 -05:00

heuristics.rb

Merge branch 'master' into google-apps

2014-11-30 21:11:59 -06:00

language.rb

Merge remote-tracking branch 'origin/master' into move-shebang

2014-11-28 17:41:10 -06:00

languages.yml

Merge branch 'master' into google-apps

2014-11-30 21:11:59 -06:00

lazy_blob.rb

Merge branch 'master' into 1233-local

2014-11-01 10:04:22 -05:00

md5.rb

Fixed typos

2013-03-03 21:26:31 +00:00

popular.yml

Add Clojure and just use the existing Bash record

2013-05-11 00:26:13 -06:00

repository.rb

Merge branch 'master' into 1233-local

2014-11-01 10:04:22 -05:00

samples.rb

Remove Linguist.interpreter_from_shebang

2014-11-28 14:14:40 -06:00

shebang.rb

Fix shebang without path

2014-11-28 14:14:10 -06:00

tokenizer.rb

added multi line comment flag for python

2013-04-19 15:33:02 +08:00

vendor.yml

Removing Mercury directory from vendor.yml

2014-11-30 07:55:55 -06:00

version.rb

Bump version to 4.0.3

2014-11-21 11:56:17 -05:00