summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-13 08:07:23 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-13 08:07:23 +0000
commit92958d0a46534f5bb02854432eeed82dd77dfe02 (patch)
treef738280c5ee905d25078a4abbf127a97a08e095e
parent8d10fc0f5608e05c0014eec4bd8aac9fa6be59ee (diff)
merges r24002 from trunk into ruby_1_9_1.
-- Remove debug print. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--marshal.c1
-rw-r--r--version.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/marshal.c b/marshal.c
index 0c49fd3390..cbed195b5b 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1374,7 +1374,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
v = r_entry(rb_reg_new("", 0, options), arg);
if (ivp) {
r_ivar(v, arg);
- rb_p(v);
*ivp = Qfalse;
}
rb_enc_copy(str, v);
diff --git a/version.h b/version.h
index f267bef033..b6b3c9134d 100644
--- a/version.h
+++ b/version.h
@@ -4,7 +4,7 @@
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
-#define RUBY_PATCHLEVEL 225
+#define RUBY_PATCHLEVEL 226
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 12