summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-25 17:35:52 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-25 17:35:52 +0000
commitbf2d4e93b1f053d3fea18890728b2e12cd7fc34b (patch)
tree44ead47ab802fd12f5026102a44a8d25c24a8233 /ChangeLog
parentae432a96b1d064e39b23aeccea9ca5cfafd71ee0 (diff)
merge revision(s) 54785: [Backport #11900]
* ruby.c (process_options): convert -e script to the encoding given by a command line option on Windows. assume it is the expected encoding. [ruby-dev:49461] [Bug #11900] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 573e5c5daf..d6a1de9f75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar 26 02:35:17 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (process_options): convert -e script to the encoding
+ given by a command line option on Windows. assume it is the
+ expected encoding. [ruby-dev:49461] [Bug #11900]
+
Sun Mar 26 02:32:12 2017 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets