1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fef073663..6e490f62cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 25 15:12:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): not set encoding of -e option from -E
+	  option if they are not compatible.
+
 Fri Jan 25 13:15:23 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ruby.c (proc_options, process_options, load_file): shouldn't effect