diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 14:58:34 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 14:58:34 +0000 |
commit | c320aa7a2ce45d107e042cd046a370fa9618601b (patch) | |
tree | 1f6e5d0c6afe5e87020dc1197a1b5cead5b9522b | |
parent | e42b19aa3a101635a40fee8de0f7bc3bfb24fc70 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/tcllib/toolbar.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,7 +1,13 @@ +Mon Mar 28 23:58:27 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo. + [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda. + + Mon Mar 28 23:57:33 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * 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. Mon Mar 28 23:56:17 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> diff --git a/ext/tk/lib/tkextlib/tcllib/toolbar.rb b/ext/tk/lib/tkextlib/tcllib/toolbar.rb index 6eae4eb3e1..6519f32cb5 100644 --- a/ext/tk/lib/tkextlib/tcllib/toolbar.rb +++ b/ext/tk/lib/tkextlib/tcllib/toolbar.rb @@ -56,7 +56,7 @@ class Tk::Tcllib::Widget::ToolbarItem < TkObject } end - def initaialize(parent, *args) + def initialize(parent, *args) @parent = @t = parent @tpath = parent.path @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-03-28" -#define RUBY_PATCHLEVEL 261 +#define RUBY_PATCHLEVEL 262 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |