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
base: f57425f7355c
Choose a base ref
...
head repository: jruby/jruby
compare: 7b7388c483de
Choose a head ref
  • 2 commits
  • 13 files changed
  • 1 contributor

Commits on Mar 5, 2015

  1. [Truffle] Moved frozen state from a field on RubyBasicObject to a fie… 

    …ld in the dynamic object shape.
    @nirvdrum
    nirvdrum committed Mar 5, 2015
    15
    Copy the full SHA
    e7fabb0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:jruby/jruby 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
    @nirvdrum
    nirvdrum committed Mar 5, 2015
    Copy the full SHA
    7b7388c View commit details
    Browse the repository at this point in the history