Merge remote-tracking branch 'origin/master' into tricknotes-ruby-22

* origin/master: (51 commits)
  its always greener
  that new green shell
  Removing stale extension
  Update README.md
  Add moon interpreter for MoonScript
  Bumping version for 3.4.1 release
  Use text.html.erb scope for HTML+ERB files
  Add sample .dyalog file for file type APL
  Added extra Papyrus sample files.
  Add sample Papyrus script
  Add Papyrus support
  Add LOLCODE support
  Add ProGuard config files to vendored files
  Recognise *.dyalog as APL sources
  Assign a bunch more TextMate scopes
  CI step for samples
  Add .command as a Shell file extension
  CI config
  Vendored gems
  Update cibuild
  ...

Conflicts:
	Gemfile
This commit is contained in:
Brandon Keepers
2014-10-31 17:36:06 -04:00
41 changed files with 1995 additions and 8 deletions

View File

@@ -1,4 +1,3 @@
source 'https://rubygems.org'
gemspec
gem 'rugged', '0.21.1b2'
gem 'test-unit', require: false if RUBY_VERSION >= '2.2'