nagachika	2013-06-25 00:12:02 +0900 (Tue, 25 Jun 2013)

  New Revision: 41605

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

  Log:
    merge revision(s) 41592:
    
    * array.c (rb_ary_zip): typo by @PragTob [Fix GH-337]
      https://github.com/ruby/ruby/pull/337

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/array.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/array.c
===================================================================
--- ruby_2_0_0/array.c	(revision 41604)
+++ ruby_2_0_0/array.c	(revision 41605)
@@ -3064,7 +3064,7 @@ take_items(VALUE obj, long n) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/array.c#L3064
  *  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.
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41604)
+++ ruby_2_0_0/ChangeLog	(revision 41605)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jun 25 00:11:46 2013  Zachary Scott  <zachary@z...>
+
+	* 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@z...>
 
 	* win32/README.win32: grammar typo by @blankenshipz [Fix GH-334]
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41604)
+++ ruby_2_0_0/version.h	(revision 41605)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41592


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