Skip to content

Commit

Permalink
Merge branch 'truffle-head' into truffle-pack
Browse files Browse the repository at this point in the history
Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  • Loading branch information
chrisseaton committed Apr 23, 2015
2 parents b5ec83a + 00fbf5a commit 02847f0
Show file tree
Hide file tree
Showing 391 changed files with 7,940 additions and 2,647 deletions.