From 5e13dd7b53eab210dd1cea28661a3a5a638a5bcd Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 23 Oct 2010 13:38:47 +0000 Subject: [PATCH] merges r29156 from trunk into ruby_1_9_2. -- * enum.c (enum_zip): fix typo of rdoc. patched by Andrei Kulakov [ruby-core:31974] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ enum.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 253c4f6e2a..7b7b4b2f74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 1 14:33:36 2010 NARUSE, Yui + + * enum.c (enum_zip): fix typo of rdoc. + patched by Andrei Kulakov [ruby-core:31974] + Wed Sep 1 12:56:36 2010 Nobuyoshi Nakada * thread.c (ruby_suppress_tracing): restore the state and invoke diff --git a/enum.c b/enum.c index 32c33fb19c..8d4692ae6d 100644 --- a/enum.c +++ b/enum.c @@ -1911,7 +1911,7 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv) * elements from each args. This generates a sequence of * n-element arrays, where n is one more than the * count of arguments. The length of the resulting sequence will be - * enum#sizeenum#size. If the size of any argument is less than * enum#size, nil values are supplied. If * a block is given, it is invoked for each output array, otherwise * an array of arrays is returned. diff --git a/version.h b/version.h index 67603b1412..a0a4d62bbc 100644 --- a/version.h +++ b/version.h @@ -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