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

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_2@53222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-12-20 20:06:21 +00:00
parent 02262a559f
commit 60c7009f02
3 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Mon Dec 21 05:05:54 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* cont.c: fix a double word typo.
[Bug #11313][ruby-core:69749]
Mon Dec 21 05:04:18 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* ext/tk/lib/multi-tk.rb: fix typos.

2
cont.c
View file

@ -1093,7 +1093,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 <code>Fiber#resume</code> method.
* The code running inside the fiber can give up control by calling
* <code>Fiber.yield</code> in which case it yields control back to caller

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-12-21"
#define RUBY_PATCHLEVEL 231
#define RUBY_PATCHLEVEL 232
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 12