Arfon Smith 302af86363 Merge branch 'master' into 1233-local ...

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

2014-09-16 16:36:10 -05:00

..

blob_helper.rb

Fixing up bin/linguist

2014-07-23 11:20:31 -05:00

classifier.rb

fix refactoring from #836

2013-12-29 01:32:56 -06:00

file_blob.rb

Handle nil blob names

2014-06-24 17:43:01 +02:00

generated.rb

Regex matching filename 'composer.lock' fixed

2014-07-28 13:24:10 +02:00

heuristics.rb

Fix typos

2014-09-15 13:24:39 +02:00

language.rb

Merge branch 'master' into 1233-local

2014-09-16 16:36:10 -05:00

languages.yml

Merge branch 'master' into 1233-local

2014-09-16 16:36:10 -05:00

lazy_blob.rb

Missing file. Duh.

2014-06-24 17:52:43 +02: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

Skip submodules when diffing

2014-06-27 16:41:23 +02:00

samples.json

Merge branch 'master' into 1233-local

2014-09-16 16:36:10 -05:00

samples.rb

Set a sort order for the samples.json file's content

2014-06-24 10:50:03 +02:00

tokenizer.rb

added multi line comment flag for python

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

vendor.yml

Merge pull request #1412 from pchaigno/thirdparty

2014-08-15 14:25:43 -05:00

version.rb

3.1.5

2014-09-05 13:24:39 -05:00