merges r20913 from trunk into ruby_1_9_1.

* ext/tk/tcltklib.c: fix wrong flag value.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 42aa1685c..03d44fa37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 22 18:00:36 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: fix wrong flag value.
+
 Mon Dec 22 12:26:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb