summaryrefslogtreecommitdiffstats
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
commit1f721fb67030e3864fde26f2d1790ba4cac68360 (patch)
tree3e499463b9a5a46863d28ddbb873211bc5d8cfe7 /ChangeLog
parent2366b9a005eeab5370c3dd088db3384cecba3c91 (diff)
downloadruby-1f721fb67030e3864fde26f2d1790ba4cac68360.tar.gz
ruby-1f721fb67030e3864fde26f2d1790ba4cac68360.tar.xz
ruby-1f721fb67030e3864fde26f2d1790ba4cac68360.zip
* ruby.c (process_options): not set encoding of -e option from -E
option if they are not compatible. git-svn-id: http://svn.ruby-lang.org/repos/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 1fef07366..6e490f62c 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