summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-12 02:36:28 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-12 02:36:28 +0000
commit9f67424dc97e2b99d98b71d08178681f0240ee86 (patch)
tree025a9cac2ba5d11a00f68cba650fdefe933844d2 /version.h
parent97acdd71435d062541510ba68fe6a33e7431e8a1 (diff)
merge revision(s) 46501,47372,47460: [Backport #10191]
* object.c (rb_obj_copy_ivar): extract function to copy instance variables only for T_OBJECT from init_copy. * object.c (rb_obj_copy_ivar): allocate no memory for empty instance variables. [ruby-core:64700] [Bug #10191] * test/ruby/test_object.rb: extend timeout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index eb4c6dfec6..dfd8cc7d70 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-09-12"
-#define RUBY_PATCHLEVEL 569
+#define RUBY_PATCHLEVEL 570
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9