summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-21 14:48:16 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-21 14:48:16 +0000
commit92e6f22226e3bd99318890b854c7213c9db09f3d (patch)
tree3dfb8d766ee1f910553090c25ffc66c95aa1542b /ChangeLog
parentcfbbe109fc9c2391ae8ec2a0f841f2dc1805f4bc (diff)
merges r23435 from trunk into ruby_1_9_1.
-- * parse.y (magic_comment_encoding): use rb_compile_warning() to show the currently parsing file name. [ruby-core:23469] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 23c1628bc..afb49566b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 16 09:19:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (magic_comment_encoding): use rb_compile_warning() to
+ show the currently parsing file name. [ruby-core:23469]
+
Thu May 21 21:47:34 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* ext/pty/pty.c (getDevice): fixes a mistake in merging r20877.