Skip to content

Commit

Permalink
Merge branch 'master' into truffle-head
Browse files Browse the repository at this point in the history 
Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  • Loading branch information
@chrisseaton
chrisseaton committed Mar 31, 2015
2 parents e002633 + ad4dcf0 commit 7be2875
Show file tree
Hide file tree
Showing 344 changed files with 4,489 additions and 2,306 deletions.