Brandon Keepers 9efd923382 Merge remote-tracking branch 'origin/master' into strategies ...

* origin/master: (165 commits)
  Add F# and GLSL samples.  Add Forth and GLSL extension .fs. Add heuristic to disambiguate between F#, Forth, and GLSL.
  byebug requires ruby 2.0
  Remove test for removed extension
  Fix typo in test
  add rake interpreter
  add python3 interpreter
  Remove old wrong_shebang.rb sample
  Add byebug
  Link to Lightshow in CONTRIBUTING.md
  Switch to a better F# grammar
  Bump Rugged again
  Checkout the master for testing
  Rugged 0.22.0b3
  Reordering
  Bump version to 4.0.3
  Add some docs for tm_scope
  Change NONE to none
  Checking other case for Chart.jS
  Test that all languages have grammars
  Fix RHTML's tm_scope
  ...

Conflicts:
	lib/linguist/language.rb

2014-11-27 10:52:44 -05:00

..

linguist

Merge remote-tracking branch 'origin/master' into strategies

2014-11-27 10:52:44 -05:00

linguist.rb

Adding Linguist::VERSION

2014-04-24 13:53:37 -05:00