1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0730a04d6..5b3952c35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Nov  9 17:48:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (locale_encoding): guestimate encoding from environment
+	  variables.  [ruby-core:13315]
+
+	* ruby.c (process_options): set primary encoding from environment.
+
 Fri Nov  9 16:51:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_each_byte): should update rbuf_off and rbuf_len for