nagachika	2015-12-21 05:06:21 +0900 (Mon, 21 Dec 2015)

  New Revision: 53222

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

  Log:
    merge revision(s) 53023: [Backport #11313]
    
    * cont.c: fix a double word typo.
      [Bug #11313][ruby-core:69749]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/cont.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 53221)
+++ ruby_2_2/ChangeLog	(revision 53222)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Dec 21 05:05:54 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* cont.c: fix a double word typo.
+	  [Bug #11313][ruby-core:69749]
+
 Mon Dec 21 05:04:18 2015  SHIBATA Hiroshi  <hsbt@r...>
 
 	* ext/tk/lib/multi-tk.rb: fix typos.
Index: ruby_2_2/cont.c
===================================================================
--- ruby_2_2/cont.c	(revision 53221)
+++ ruby_2_2/cont.c	(revision 53222)
@@ -1093,7 +1093,7 @@ rb_cont_call(int argc, VALUE *argv, VALU https://github.com/ruby/ruby/blob/trunk/ruby_2_2/cont.c#L1093
  *  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
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 53221)
+++ ruby_2_2/version.h	(revision 53222)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53023


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