From 92e6f22226e3bd99318890b854c7213c9db09f3d Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 May 2009 14:48:16 +0000
Subject: 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
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

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.
-- 
cgit