usa	2013-06-26 16:30:26 +0900 (Wed, 26 Jun 2013)

  New Revision: 41646

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

  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_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/include/ruby/intern.h
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/include/ruby/intern.h
===================================================================
--- ruby_1_9_3/include/ruby/intern.h	(revision 41645)
+++ ruby_1_9_3/include/ruby/intern.h	(revision 41646)
@@ -170,7 +170,6 @@ VALUE rb_Complex(VALUE, VALUE); https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/include/ruby/intern.h#L170
 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_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 41645)
+++ ruby_1_9_3/ChangeLog	(revision 41646)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Jun 26 16:29:41 2013  Charlie Somerville  <charliesome@r...>
+
+	* intern.h: remove dangling rb_class_init_copy declaration
+	  [ruby-core:55120] [Bug #8434]
+
 Wed Jun 26 16:22:12 2013  Charlie Somerville  <charliesome@r...>
 
 	* class.c (include_modules_at): invalidate method cache if included
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 41645)
+++ ruby_1_9_3/version.h	(revision 41646)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 438
+#define RUBY_PATCHLEVEL 439
 
 #define RUBY_RELEASE_DATE "2013-06-26"
 #define RUBY_RELEASE_YEAR 2013

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


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