Permalink
Browse files

Merge JRuby's ruby-debug-base

Conflicts:
	.gitignore
	AUTHORS
	ChangeLog
	README
	Rakefile
	lib/ruby-debug-base.rb
	svn2cl_usermap
  • Loading branch information...
2 parents 1e9d7f0 + 344b3be commit 5883da3e2f5811fb6b11f3ec31119c9583cd7750 @jfirebaugh jfirebaugh committed Aug 7, 2011
View
@@ -16,3 +16,5 @@ pkg
ruby-debug-*.tar.gz
ext/*.o
ext/ruby_debug.bundle
+tmp/*
+ruby_debug.jar
View
@@ -1,7 +1,12 @@
Author and maintainer:
Kent Sibilev
+JRuby Extension Authors:
+Martin Krauskopf
+Peter Brant
+
Contributers:
Markus Barchfeld
R. Bernstein
Anders Lindgren
+Chris Nelson
Oops, something went wrong.

0 comments on commit 5883da3

Please sign in to comment.