summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 09:33:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 09:33:40 +0000
commit5464a9474ab4b39ff41842084db64d3093108121 (patch)
treec84cdedf49a5c2d41521747f58adda99c0139921
parentba94b8ce0f10e8a51be1b80da3b7d906b9a5d424 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/tk/lib/tkextlib/blt/tree.rb2
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 74dc68a2f7..352c6557d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
+
Fri Mar 25 18:32:44 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
diff --git a/ext/tk/lib/tkextlib/blt/tree.rb b/ext/tk/lib/tkextlib/blt/tree.rb
index 1a3563e60d..37f63509e9 100644
--- a/ext/tk/lib/tkextlib/blt/tree.rb
+++ b/ext/tk/lib/tkextlib/blt/tree.rb
@@ -635,7 +635,7 @@ module Tk::BLT
}
end
- def initialzie(name = nil)
+ def initialize(name = nil)
if name
@path = @id = name
else
diff --git a/version.h b/version.h
index ec2840cb6c..4c1eae7d0f 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 476
+#define RUBY_PATCHLEVEL 477
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3