From 9be191355f2408065c5115526e2eb31faed8c1d0 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Dec 2008 04:10:12 +0000
Subject: merges r20903 from trunk into ruby_1_9_1. * ext/tk/lib/tk.rb:
 temporary patch for trouble on TkAqua (> Tk8.4.9).

* ext/tk/sample/demos-jp/widget: set encoding to a demo-code string to
  avoid garbled text on the Code Window.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 27710c67a..7ff701e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec 22 02:54:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: temporary patch for trouble on TkAqua (> Tk8.4.9).
+
+	* ext/tk/sample/demos-jp/widget: set encoding to a demo-code string to
+	  avoid garbled text on the Code Window.
+
 Sun Dec 21 14:48:51 2008  TAKAO Kouji  <kouji@takao7.net>
 
 	* test/readline/test_readline_history.rb: checked encoding.
-- 
cgit