Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ef2836714177
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e143db61d9c9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 10, 2017

  1. Include Ruby Licensed json libs in COPYING #4587

    @madrob
    madrob committed May 10, 2017
    Copy the full SHA
    75ed50c View commit details

  2. Merge pull request #4604 from madrob/master 

    Include Ruby Licensed json libs in COPYING #4587
    @headius
    headius authored May 10, 2017
    Copy the full SHA
    e143db6 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 COPYING
4 changes: 4 additions & 0 deletions COPYING
View file
Original file line number Diff line number Diff line change
@@ -91,6 +91,10 @@ below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.
library. This includes all files under lib/ruby/stdlib/racc.
See LICENSE.RUBY.

json-generator and json-parser (https://github.com/flori/json) native
extenstions under the same license terms as the Ruby standard library.
See LICENSE.RUBY

The complete text of the Eclipse Public License is as follows:

Eclipse Public License - v 1.0