naruse	2016-03-29 15:05:05 +0900 (Tue, 29 Mar 2016)

  New Revision: 54367

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

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

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/ext/tk/lib/tkextlib/tcllib/toolbar.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54366)
+++ ruby_2_3/version.h	(revision 54367)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 24
+#define RUBY_PATCHLEVEL 25
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_3/ext/tk/lib/tkextlib/tcllib/toolbar.rb
===================================================================
--- ruby_2_3/ext/tk/lib/tkextlib/tcllib/toolbar.rb	(revision 54366)
+++ ruby_2_3/ext/tk/lib/tkextlib/tcllib/toolbar.rb	(revision 54367)
@@ -57,7 +57,7 @@ class Tk::Tcllib::Widget::ToolbarItem < https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/tk/lib/tkextlib/tcllib/toolbar.rb#L57
     }
   end
 
-  def initaialize(parent, *args)
+  def initialize(parent, *args)
     @parent = @t = parent
     @tpath = parent.path
 
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54366)
+++ ruby_2_3/ChangeLog	(revision 54367)
@@ -1,7 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Mar 29 15:05:02 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
+	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
+
+
 Tue Mar 29 15:04:42 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.
+	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
 
 
 Tue Mar 29 15:04:19 2016  CHIKANAGA Tomoyuki  <nagachika@r...>

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54021


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