1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4317e0b3b..136230135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Oct 12 15:04:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* trunk/parse.y (magic_comments): add "encoding" as same as "coding".
+
+	* trunk/parse.y (set_file_encoding): special file encoding handling.
+
+	* trunk/parse.y (parser_yylex): ditto.
+
 Thu Oct 11 21:10:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* include/ruby/node.h (NOEX_LOCAL): remove unused local visibility.