Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into truffle-head
Conflicts:
	core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java
	core/src/main/java/org/jruby/truffle/nodes/control/DoWhileNode.java
	core/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java
	core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
  • Loading branch information
chrisseaton committed Oct 30, 2014
2 parents 84177f2 + af2cd60 commit 58bd0ec
Show file tree
Hide file tree
Showing 61 changed files with 639 additions and 3,054 deletions.
5 changes: 0 additions & 5 deletions .classpath

This file was deleted.

113 changes: 58 additions & 55 deletions .gitignore
@@ -1,76 +1,73 @@
!.gitignore

*.[oa]
*.bundle
*.gz
*.zip
*.md5
*.sha1
*.orig
*.rej
*.releaseBackup
release.properties
jruby-complete.jar
bin/*
!bin/gem
!bin/update_rubygems
*.sha1
*.so
*.sw[mnop]
*.versionsBackup
*.zip
*~

.DS_Store
.debug.properties
.redcar
/.rbx/
build
build.eclipse
build.properties
target
build_graph.png
core/src/main/java/org/jruby/runtime/Constants.java
dependency-reduced-pom.xml
dev_null
dist
ext/*/pom-*.gemspec.xml
lib/jruby*.jar
lib/native
lib/jni
lib/ruby/gems
lib/ruby/shared/rubygems/defaults/jruby_native.rb
lib/ruby/shared/krypt*
lib/ruby/shared/jopenssl*
lib/ruby/shared/org/
lib/ruby/shared/openssl
lib/ruby/shared/jar*
nbproject/private
share
latest_source_cache
docs/api
test/rails
test/prawn
ext/*/pom-*.gemspec.xml
gems/*/Manifest.txt
gems/*/lib/*.jar
gems/*/lib/jruby-jars/version.rb
gems/*/pkg
*.orig
*.rej
*~
tool/nailgun/Makefile
tool/nailgun/ng
tool/nailgun/config.log
tool/nailgun/config.status
jruby-findbugs.html
.debug.properties
test/testapp/testapp
glob_test
spaces test
.DS_Store
jruby-complete.jar
jruby-findbugs.html
latest_source_cache
lib/jni
lib/jruby*.jar
lib/native
lib/ruby/cext/
*.so
*.bundle
*.[oa]
*.versionsBackup
dev_null
.redcar
/.externalToolBuilders/
.metadata
.idea/workspace.xml
shared.iml
build_graph.png
/.idea/
/.rbx/
*.sw[mnop]
lib/ruby/gems
lib/ruby/shared/*jopenssl*.jar
lib/ruby/shared/bcpkix-jdk15on-*.jar
lib/ruby/shared/bcprov-jdk15on-*.jar
lib/ruby/shared/*jopenssl*.jar
lib/ruby/shared/readline/*readline*.jar
lib/ruby/shared/jar*
lib/ruby/shared/jline
lib/ruby/shared/jopenssl*
lib/ruby/shared/krypt*
lib/ruby/shared/openssl
lib/ruby/shared/org/
lib/ruby/shared/readline/*readline*.jar
lib/ruby/shared/ripper.jar
core/src/main/java/org/jruby/runtime/Constants.java
dependency-reduced-pom.xml
lib/ruby/shared/rubygems/defaults/jruby_native.rb
release.properties
share
spaces test
target
test/prawn
test/rails
test/testapp/testapp
tool/nailgun/Makefile
tool/nailgun/config.log
tool/nailgun/config.status
tool/nailgun/ng

# binaries
!bin/gem
!bin/update_rubygems
bin/*

# These files are bin files for default gems
!lib/ruby/gems/shared/gems/rake-10.1.0/bin/rake
Expand All @@ -87,5 +84,11 @@ maven/jruby-complete/src/it/osgi*
.idea
*.iml

# NetBeans files
nbproject/private

# Eclipse project files
/.metadata

# Truffle benchmark stuff
reference.txt
34 changes: 0 additions & 34 deletions .project

This file was deleted.

0 comments on commit 58bd0ec

Please sign in to comment.