From 734ac67206cf8ed0205ecb3c4f35410722228697 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 25 Feb 2016 08:34:37 +0000 Subject: merge revision(s) 53023: [Backport #11313] * cont.c: fix a double word typo. [Bug #11313][ruby-core:69749] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ cont.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9140233e2..8b274e569a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 25 17:33:38 2016 SHIBATA Hiroshi + + * cont.c: fix a double word typo. + [Bug #11313][ruby-core:69749] + Thu Feb 25 17:32:23 2016 SHIBATA Hiroshi * ext/tk/lib/multi-tk.rb: fix typos. diff --git a/cont.c b/cont.c index 3b05f995d4..ed1d6abdc8 100644 --- a/cont.c +++ b/cont.c @@ -1081,7 +1081,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval) * comes with a small 4KB stack. This enables the fiber to be paused from deeply * nested function calls within the fiber block. * - * When a fiber is created it will not run automatically. Rather it must be + * When a fiber is created it will not run automatically. Rather it must * be explicitly asked to run using the Fiber#resume method. * The code running inside the fiber can give up control by calling * Fiber.yield in which case it yields control back to caller diff --git a/version.h b/version.h index d11c64463b..35aea000c7 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-02-25" -#define RUBY_PATCHLEVEL 443 +#define RUBY_PATCHLEVEL 444 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 2 -- cgit v1.2.3