summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--array.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c5333a944..6cbb195501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]
diff --git a/array.c b/array.c
index 5d1cb7fc6c..091e0cf0a1 100644
--- a/array.c
+++ b/array.c
@@ -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.
diff --git a/version.h b/version.h
index a3dec47441..c88488997f 100644
--- a/version.h
+++ b/version.h
@@ -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