From 246ffa87fd6158860aa08663bf038da57e893829 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Mar 2016 06:04:26 +0000
Subject: merge revision(s) 54018: [Backport #11886]

	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
	  [Bug #11886] The patch provided by Akira Matsuda.

	* ext/tk/sample/*.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk/menubar.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/tk/lib')

diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb
index 17cb4477c9..6c5df6b1c2 100644
--- a/ext/tk/lib/tk/menubar.rb
+++ b/ext/tk/lib/tk/menubar.rb
@@ -77,7 +77,7 @@
 #                        'tearoff'=>false,
 #                        'foreground'=>'grey40',
 #                        'activeforeground'=>'red',
-#                        'font'=>'Helvetia 12 bold')
+#                        'font'=>'Helvetica 12 bold')
 # menubar.pack('side'=>'top', 'fill'=>'x')
 
 # See tk/menuspce.rb about the format of the menu_spec
-- 
cgit v1.2.3