summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 09:34:26 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 09:34:26 +0000
commitf73e2f5321477ce9fb3783b799050fe59f37ada2 (patch)
treef7dec16c2667038ecdd1a579b416025c28866ca2
parent5464a9474ab4b39ff41842084db64d3093108121 (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_1@54280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/tk/lib/tkextlib/tcllib/toolbar.rb2
-rw-r--r--version.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 352c6557d0..e8d39331f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+Fri Mar 25 18:34:20 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.
+
+
Fri Mar 25 18:33:34 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.
Fri Mar 25 18:32:44 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
diff --git a/version.h b/version.h
index 4c1eae7d0f..30c69b7995 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.9"
#define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 477
+#define RUBY_PATCHLEVEL 478
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3