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: f7cf5a414771
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac0d512a7b95
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 21, 2015

  1. [Truffle] Fix copyright years.

    @eregon
    eregon committed Jan 21, 2015
    Copy the full SHA
    f5544c3 View commit details

  2. [Truffle] Generalize a bit truffle paths.

    @eregon
    eregon committed Jan 21, 2015
    Copy the full SHA
    ac0d512 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 core/src/main/ruby/jruby/truffle/core/kernel.rb
  2. +1 −1 core/src/main/ruby/jruby/truffle/core/method.rb
  3. +2 −2 tool/update_truffle_copyright.rb
2 changes: 1 addition & 1 deletion core/src/main/ruby/jruby/truffle/core/kernel.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
# Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
2 changes: 1 addition & 1 deletion core/src/main/ruby/jruby/truffle/core/method.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
4 changes: 2 additions & 2 deletions tool/update_truffle_copyright.rb
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@

truffle_paths = %w[
core/src/main/java/org/jruby/truffle
core/src/main/ruby/jruby/truffle/core
test/truffle/pe/pe.rb
core/src/main/ruby/jruby/truffle
test/truffle
] + [__FILE__]

truffle_paths.each do |path|