nagachika	2013-06-09 01:54:03 +0900 (Sun, 09 Jun 2013)

  New Revision: 41190

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

  Log:
    merge revision(s) 40913: [Backport #8434]
    
    * intern.h: remove dangling rb_class_init_copy declaration
      [ruby-core:55120] [Bug #8434]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/include/ruby/intern.h
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/include/ruby/intern.h
===================================================================
--- ruby_2_0_0/include/ruby/intern.h	(revision 41189)
+++ ruby_2_0_0/include/ruby/intern.h	(revision 41190)
@@ -172,7 +172,6 @@ VALUE rb_Complex(VALUE, VALUE); https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/intern.h#L172
 VALUE rb_class_boot(VALUE);
 VALUE rb_class_new(VALUE);
 VALUE rb_mod_init_copy(VALUE, VALUE);
-VALUE rb_class_init_copy(VALUE, VALUE);
 VALUE rb_singleton_class_clone(VALUE);
 void rb_singleton_class_attached(VALUE,VALUE);
 VALUE rb_make_metaclass(VALUE, VALUE);
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41189)
+++ ruby_2_0_0/ChangeLog	(revision 41190)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jun  9 01:38:55 2013  Charlie Somerville  <charliesome@r...>
+
+	* intern.h: remove dangling rb_class_init_copy declaration
+	  [ruby-core:55120] [Bug #8434]
+
 Sun Jun  9 01:30:57 2013  Shugo Maeda  <shugo@r...>
 
 	* lib/net/imap.rb (capability_response): should ignore trailing
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41189)
+++ ruby_2_0_0/version.h	(revision 41190)
@@ -1,6 +1,6 @@ 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-06-09"
-#define RUBY_PATCHLEVEL 210
+#define RUBY_PATCHLEVEL 211
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

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


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