From 4d45207c073e57841d07c0ae40a8be32a0225739 Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 26 Mar 2013 17:51:32 +0000 Subject: merge revision(s) 39739: [Backport #8081] * object.c (Init_Object): remove Module#used, which has been introduced in Ruby 2.0 by mistake. [Bug #7916] [ruby-core:52719] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ object.c | 1 - version.h | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f051db6c14..a6abd501b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 27 02:50:45 2013 Shugo Maeda + + * object.c (Init_Object): remove Module#used, which has been + introduced in Ruby 2.0 by mistake. [Bug #7916] [ruby-core:52719] + Mon Mar 25 02:02:15 2013 Tadayoshi Funaba * complex.c: edited rdoc. diff --git a/object.c b/object.c index 3da19cdf3d..6ff3377031 100644 --- a/object.c +++ b/object.c @@ -3009,7 +3009,6 @@ Init_Object(void) rb_define_private_method(rb_cModule, "included", rb_obj_dummy, 1); rb_define_private_method(rb_cModule, "extended", rb_obj_dummy, 1); rb_define_private_method(rb_cModule, "prepended", rb_obj_dummy, 1); - rb_define_private_method(rb_cModule, "used", rb_obj_dummy, 1); rb_define_private_method(rb_cModule, "method_added", rb_obj_dummy, 1); rb_define_private_method(rb_cModule, "method_removed", rb_obj_dummy, 1); rb_define_private_method(rb_cModule, "method_undefined", rb_obj_dummy, 1); diff --git a/version.h b/version.h index 38a47ccacc..531bf6b215 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-03-25" -#define RUBY_PATCHLEVEL 96 +#define RUBY_RELEASE_DATE "2013-03-27" +#define RUBY_PATCHLEVEL 97 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" -- cgit v1.2.3