naruse	2011-07-22 21:49:55 +0900 (Fri, 22 Jul 2011)

  New Revision: 32626

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

  Log:
    merge revision(s) 32595:
    
    * enum.c (enum_inject): remove empty line to notify rdoc
      Enumerable#reduce is alias. patched by milki@github.
      https://github.com/ruby/ruby/pull/26

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/enum.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32625)
+++ ruby_1_9_3/ChangeLog	(revision 32626)
@@ -1,3 +1,9 @@
+Fri Jul 22 21:49:48 2011  NARUSE, Yui  <naruse@r...>
+
+	* enum.c (enum_inject): remove empty line to notify rdoc
+	  Enumerable#reduce is alias. patched by milki@github.
+	  https://github.com/ruby/ruby/pull/26
+
 Fri Jul 22 21:49:28 2011  NARUSE, Yui  <naruse@r...>
 
 	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#each):
Index: ruby_1_9_3/enum.c
===================================================================
--- ruby_1_9_3/enum.c	(revision 32625)
+++ ruby_1_9_3/enum.c	(revision 32626)
@@ -521,7 +521,6 @@
  *     enum.inject(sym)          -> obj
  *     enum.inject(initial) {| memo, obj | block }  -> obj
  *     enum.inject          {| memo, obj | block }  -> obj
- *
  *     enum.reduce(initial, sym) -> obj
  *     enum.reduce(sym)          -> obj
  *     enum.reduce(initial) {| memo, obj | block }  -> obj

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