From ba94b8ce0f10e8a51be1b80da3b7d906b9a5d424 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 25 Mar 2016 09:32:49 +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_1@54278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 67b78a7b33..74dc68a2f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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]
+	  [Bug #11886] The patch provided by Akira Matsuda.
+
+	* ext/tk/sample/*.rb: ditto.
+
 Fri Mar 25 18:30:55 2016  Anthony Dmitriyev  <antstorm@gmail.com>
 
 	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
-- 
cgit v1.2.3