diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-24 15:12:02 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-24 15:12:02 +0000 |
commit | 80a83ca64f59d26c14c20e9250bf394722b2e396 (patch) | |
tree | 0e28649328fc773c58f33e33cbab79e5a9914a37 | |
parent | 8b2c390b4a3e057f0ef414643938fd1526afbee6 (diff) |
merge revision(s) 41592:
* array.c (rb_ary_zip): typo by @PragTob [Fix GH-337]
https://github.com/ruby/ruby/pull/337
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | array.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Jun 25 00:11:46 2013 Zachary Scott <zachary@zacharyscott.net> + + * array.c (rb_ary_zip): typo by @PragTob [Fix GH-337] + https://github.com/ruby/ruby/pull/337 + Tue Jun 25 00:10:54 2013 Zachary Scott <zachary@zacharyscott.net> * win32/README.win32: grammar typo by @blankenshipz [Fix GH-334] @@ -3064,7 +3064,7 @@ take_items(VALUE obj, long n) * corresponding elements from each argument. * * This generates a sequence of <code>ary.size</code> _n_-element arrays, - * where _n_ is one more that the count of arguments. + * where _n_ is one more than the count of arguments. * * If the size of any argument is less than the size of the initial array, * +nil+ values are supplied. @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-25" -#define RUBY_PATCHLEVEL 239 +#define RUBY_PATCHLEVEL 240 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 |