nagachika	2016-03-28 23:57:42 +0900 (Mon, 28 Mar 2016)

  New Revision: 54318

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

  Log:
    merge revision(s) 54020: [Backport #11890]
    
    * ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
    [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/tk/lib/tkextlib/blt/tree.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54317)
+++ ruby_2_2/version.h	(revision 54318)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-28"
-#define RUBY_PATCHLEVEL 260
+#define RUBY_PATCHLEVEL 261
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54317)
+++ ruby_2_2/ChangeLog	(revision 54318)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Mar 28 23:57:33 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
+	[ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
+
+
 Mon Mar 28 23:56:17 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
Index: ruby_2_2/ext/tk/lib/tkextlib/blt/tree.rb
===================================================================
--- ruby_2_2/ext/tk/lib/tkextlib/blt/tree.rb	(revision 54317)
+++ ruby_2_2/ext/tk/lib/tkextlib/blt/tree.rb	(revision 54318)
@@ -635,7 +635,7 @@ module Tk::BLT https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/lib/tkextlib/blt/tree.rb#L635
       }
     end
 
-    def initialzie(name = nil)
+    def initialize(name = nil)
       if name
         @path = @id = name
       else

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


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