kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r29156 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-10-23 13:38:47 +00:00
parent 7f5d559cfc
commit 5e13dd7b53
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Sep 1 14:33:36 2010 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org> Wed Sep 1 12:56:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (ruby_suppress_tracing): restore the state and invoke * thread.c (ruby_suppress_tracing): restore the state and invoke

2
enum.c
View file

@ -1911,7 +1911,7 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
* elements from each <i>args</i>. This generates a sequence of * 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 * <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 * 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 * <code>enum#size</code>, <code>nil</code> values are supplied. If
* a block is given, it is invoked for each output array, otherwise * a block is given, it is invoked for each output array, otherwise
* an array of arrays is returned. * an array of arrays is returned.

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 28 #define RUBY_PATCHLEVEL 29
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1