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/cast/CmpIntNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/coerce/SymbolOrToStrNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToStrNode.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/FiberNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/FileNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/IONodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java
	truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
	truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  • Loading branch information
chrisseaton committed Apr 23, 2015
2 parents 2961673 + 9bed84f commit 00fbf5a
Show file tree
Hide file tree
Showing 391 changed files with 7,944 additions and 2,650 deletions.