aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-25 06:12:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-25 06:12:44 +0000
commit95e59bd9e073edfe57b9c773ca414e6bb5ef5d83 (patch)
tree3e499463b9a5a46863d28ddbb873211bc5d8cfe7 /ChangeLog
parenta470a2f1e184bf46642e54df093e32896dcf6e4e (diff)
downloadruby-95e59bd9e073edfe57b9c773ca414e6bb5ef5d83.tar.gz
* ruby.c (process_options): not set encoding of -e option from -E
option if they are not compatible. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
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