Brandon Keepers 5b2b3a2b53 Merge remote-tracking branch 'origin/master' into test-helper ...

* origin/master: (31 commits)
  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
  Chart JS is vendored
  Switch to a better grammar for Bro
  reorder again…
  put cjsx at the top
  Use a SQF grammar for SQF files
  move cjsx before iced
  move cjsx before iced
  change component name
  ...

Conflicts:
	test/test_language.rb

2014-11-26 15:07:27 -05:00

..

helper.rb

Add test helper to make test env consistent

2014-11-18 16:46:09 -05:00

test_blob.rb

Merge remote-tracking branch 'origin/master' into test-helper

2014-11-26 15:07:27 -05:00

test_classifier.rb

Add test helper to make test env consistent

2014-11-18 16:46:09 -05:00

test_heuristics.rb

Merge remote-tracking branch 'origin/master' into test-helper

2014-11-18 16:48:26 -05:00

test_language.rb

Merge remote-tracking branch 'origin/master' into test-helper

2014-11-26 15:07:27 -05:00

test_md5.rb

Add test helper to make test env consistent

2014-11-18 16:46:09 -05:00

test_pedantic.rb

Merge remote-tracking branch 'origin/master' into test-helper

2014-11-18 16:48:26 -05:00

test_repository.rb

Add test helper to make test env consistent

2014-11-18 16:46:09 -05:00

test_samples.rb

Merge remote-tracking branch 'origin/master' into test-helper

2014-11-18 16:48:26 -05:00

test_tokenizer.rb

Add test helper to make test env consistent

2014-11-18 16:46:09 -05:00