Merge branch 'master' into cpp_heuristic

Browse Source

Conflicts:
	lib/linguist/samples.json

...

This commit is contained in:

Arfon Smith

2013-12-22 19:25:01 -06:00

parent b2a5c30a44 3ece15b398

commit e4d381d81c

9 changed files with 1217 additions and 492 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

377

lib/linguist/samples.json

File diff suppressed because it is too large Load Diff