nagachika	2016-03-29 00:00:46 +0900 (Tue, 29 Mar 2016)

  New Revision: 54320

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

  Log:
    merge revision(s) 54022: [Backport #11893]
    
    * ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
      [ruby-core:72513] [Bug #11893] 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/tcllib/tablelist_tile.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
===================================================================
--- ruby_2_2/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb	(revision 54319)
+++ ruby_2_2/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb	(revision 54320)
@@ -15,7 +15,7 @@ unless defined? Tk::Tcllib::Tablelist_us https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb#L15
   Tk::Tcllib::Tablelist_usingTile = true
 end
 
-requrie 'tkextlib/tcllib/tablelist_core'
+require 'tkextlib/tcllib/tablelist_core'
 
 module Tk
   module Tcllib
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54319)
+++ ruby_2_2/version.h	(revision 54320)
@@ -1,10 +1,10 @@ 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 262
+#define RUBY_RELEASE_DATE "2016-03-29"
+#define RUBY_PATCHLEVEL 263
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"
 
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54319)
+++ ruby_2_2/ChangeLog	(revision 54320)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 00:00:27 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
+	  [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda.
+
+
 Mon Mar 28 23:58:27 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.

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


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