Arfon Smith 21f0ac99e6 Merge branch 'master' into 1232-local ...

Conflicts:
	lib/linguist/samples.json

2014-06-20 12:11:43 +01:00

..

blob_helper.rb

Use the :ruby_encoding value from charlock 0.7.2

2014-06-04 15:51:33 -05:00

classifier.rb

fix refactoring from #836

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

file_blob.rb

only check for shebangs in executable files

2011-11-23 01:37:01 -08:00

generated.rb

Added generated rule for Zephir language

2014-06-16 19:20:43 +04:00

heuristics.rb

Disambiguate .r extension between Rebol and R

2014-03-27 16:54:24 +00:00

language.rb

Delete primary_extension from language data

2014-05-01 21:35:49 +02:00

languages.yml

Merge branch 'master' into 1232-local

2014-06-20 12:11:43 +01: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

Initialize breakdown hash

2013-12-29 02:55:17 -08:00

samples.json

Merge branch 'master' into 1232-local

2014-06-20 12:11:43 +01:00

samples.rb

Place guards, checks for multiline shell hacks

2013-12-06 22:04:40 -08:00

tokenizer.rb

added multi line comment flag for python

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

vendor.yml

Add Octicons entries to vendor.yml

2014-06-15 16:22:18 +02:00

version.rb

Bumps to 2.12.0

2014-06-11 14:00:46 -04:00