yugui	2010-10-23 22:38:47 +0900 (Sat, 23 Oct 2010)

  New Revision: 29575

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

  Log:
    merges r29156 from trunk into ruby_1_9_2.
    --
    * enum.c (enum_zip): fix typo of rdoc.
      patched by Andrei Kulakov [ruby-core:31974]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/enum.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29574)
+++ ruby_1_9_2/ChangeLog	(revision 29575)
@@ -1,3 +1,8 @@
+Wed Sep  1 14:33:36 2010  NARUSE, Yui  <naruse@r...>
+
+	* enum.c (enum_zip): fix typo of rdoc.
+	  patched by Andrei Kulakov [ruby-core:31974]
+
 Wed Sep  1 12:56:36 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (ruby_suppress_tracing): restore the state and invoke
Index: ruby_1_9_2/enum.c
===================================================================
--- ruby_1_9_2/enum.c	(revision 29574)
+++ ruby_1_9_2/enum.c	(revision 29575)
@@ -1911,7 +1911,7 @@
  *  elements from each <i>args</i>.  This generates a sequence of
  *  <em>n</em>-element arrays, where <em>n</em> is one more than the
  *  count of arguments.  The length of the resulting sequence will be
- *  <code>enum#size</code.  If the size of any argument is less than
+ *  <code>enum#size</code>.  If the size of any argument is less than
  *  <code>enum#size</code>, <code>nil</code> values are supplied. If
  *  a block is given, it is invoked for each output array, otherwise
  *  an array of arrays is returned.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29574)
+++ ruby_1_9_2/version.h	(revision 29575)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 28
+#define RUBY_PATCHLEVEL 29
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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