1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b92611f157..a3283db7ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Oct 10 19:21:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (magic_comment_encoding): warns when ignored.
+
+	* parse.y (parser_magic_comment): replaces '-' with '_'.
+
+	* parse.y (parser_yylex): allows magic comments indented and the
+	  second line or later.
+
 Fri Oct 10 17:26:50 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/json/ext/parser/parser.c (JSON_parse_string):