From 08b3f60e5746f4b68dbed09a6305414a4c398d2f Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 May 2009 09:48:14 +0000
Subject: merges r23439 from trunk into ruby_1_9_1. -- * sample/drb/dhasenc.rb:
 add magic comment for encoding.

* sample/mine.rb: ditto.

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

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index e4ad5578d..6a79ead29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat May 16 10:59:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/drb/dhasenc.rb: add magic comment for encoding.
+
+	* sample/mine.rb: ditto.
+
+	* ext/tk/sample/tcltklib/sample1.rb: ditto.
+
 Fri May 15 15:15:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* variable.c (rb_autoload_load): checks if iv_tbl is valid.
-- 
cgit