nagachika	2013-03-27 02:51:32 +0900 (Wed, 27 Mar 2013)

  New Revision: 39951

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39951

  Log:
    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]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/object.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39950)
+++ ruby_2_0_0/ChangeLog	(revision 39951)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar 27 02:50:45 2013  Shugo Maeda  <shugo@r...>
+
+	* 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  <tadf@d...>
 
 	* complex.c: edited rdoc.
Index: ruby_2_0_0/object.c
===================================================================
--- ruby_2_0_0/object.c	(revision 39950)
+++ ruby_2_0_0/object.c	(revision 39951)
@@ -3009,7 +3009,6 @@ Init_Object(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/object.c#L3009
     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);
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39950)
+++ ruby_2_0_0/version.h	(revision 39951)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39739


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/