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

  New Revision: 53221

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

  Log:
    merge revision(s) 53022: [Backport #11764]
    
    * ext/tk/lib/multi-tk.rb: fix typos.
      [Bug #11764][ruby-core:71800]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/tk/lib/multi-tk.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 53220)
+++ ruby_2_2/ChangeLog	(revision 53221)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Dec 21 05:04:18 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* ext/tk/lib/multi-tk.rb: fix typos.
+	  [Bug #11764][ruby-core:71800]
+
 Wed Dec 16 21:10:19 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* ext/fiddle/handle.c: check tainted string arguments.
Index: ruby_2_2/ext/tk/lib/multi-tk.rb
===================================================================
--- ruby_2_2/ext/tk/lib/multi-tk.rb	(revision 53220)
+++ ruby_2_2/ext/tk/lib/multi-tk.rb	(revision 53221)
@@ -1490,17 +1490,17 @@ class MultiTkIp https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/lib/multi-tk.rb#L1490
         begin
           @interp._eval("::safe::disallowTk #{slave}")
         rescue
-          warn("Waring: fail to call '::safe::disallowTk'") if $DEBUG
+          warn("Warning: fail to call '::safe::disallowTk'") if $DEBUG
         end
       else # toplevel path
         begin
           @interp._eval("::safe::tkDelete {} #{top} #{slave}")
         rescue
-          warn("Waring: fail to call '::safe::tkDelete'") if $DEBUG
+          warn("Warning: fail to call '::safe::tkDelete'") if $DEBUG
           begin
             @interp._eval("destroy #{top}")
           rescue
-            warn("Waring: fail to destroy toplevel") if $DEBUG
+            warn("Warning: fail to destroy toplevel") if $DEBUG
           end
         end
       end
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 53220)
+++ ruby_2_2/version.h	(revision 53221)
@@ -1,10 +1,10 @@ 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-16"
-#define RUBY_PATCHLEVEL 230
+#define RUBY_RELEASE_DATE "2015-12-21"
+#define RUBY_PATCHLEVEL 231
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 

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


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