From d605f1e59685982e1f9371f8f7cbab646ecc410b Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 Jan 2009 13:32:06 +0000
Subject: merges r21406 from trunk into ruby_1_9_1. * ext/tk/lib/tk.rb: rescue
 abnormal Encoding.locale_charmap value.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index d62d62abb..1f4229b52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan  9 13:20:08 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
+
 Fri Jan  9 10:40:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some
-- 
cgit