From 15fd502f5369ad1e9c801287445b39a6316b2fbd Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 29 Sep 2010 12:25:19 +0000 Subject: [PATCH] merges r29043 from trunk into ruby_1_9_2. -- * enum.c (enum_inject): fix typo of rdoc. patched by Andrei Kulakov [ruby-core:31768] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29369 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 5fb33b4272..ba772114e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 19 11:11:24 2010 NARUSE, Yui + + * enum.c (enum_inject): fix typo of rdoc. + patched by Andrei Kulakov [ruby-core:31768] + Thu Aug 19 06:03:27 2010 Nobuyoshi Nakada * vm_insnhelper.c (vm_push_frame): initialize block_iseq. a patch diff --git a/enum.c b/enum.c index fc8a3c35d2..32c33fb19c 100644 --- a/enum.c +++ b/enum.c @@ -527,7 +527,7 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv) * operation, specified by a block or a symbol that names a * method or operator. * - * If you specify a block, then for each element in enum + * If you specify a block, then for each element in enum * the block is passed an accumulator value (memo) and the element. * If you specify a symbol instead, then each element in the collection * will be passed to the named method of memo. diff --git a/version.h b/version.h index 457538846b..83675cc1a9 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.2" #define RUBY_RELEASE_DATE "2010-09-29" -#define RUBY_PATCHLEVEL 2 +#define RUBY_PATCHLEVEL 3 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9