summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-11 08:02:36 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-11 08:02:36 +0000
commit756cd2852d8faea5139b01bfd5e596d6f9e35b14 (patch)
tree6bc79647b92e8952521ebcec674b1e9e24fd6bc9 /ChangeLog
parenta82d24aa8237d50a8c7d7178d0535327e7ec645c (diff)
* io.c (extract_binmode): raise error even if binmode and textmode
don't conflict. [Bug #5918] [ruby-core:42199] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39720 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 479fa5bd4f..82db94966c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 11 16:57:00 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c (extract_binmode): raise error even if binmode and textmode
+ don't conflict. [Bug #5918] [ruby-core:42199]
+
Mon Mar 11 12:25:12 2013 NARUSE, Yui <naruse@ruby-lang.org>
* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.