summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-10 04:05:59 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-10 04:05:59 +0000
commitaa1fdb90530fb9d440ab2eae182bf085f1ca2570 (patch)
tree70001203cb781f2364cb0a4b69b36d1c13bf887b /ChangeLog
parentc13b3808b971e3f59c957324dba039b46f3a9853 (diff)
merges r28537 and r28555 from trunk into ruby_1_9_2.
-- * io.c (swallow, prepare_getline_args, rb_io_getline_1): fix for paragraph mode reading in non-ascii-compatible encoding. [ruby-dev:41803] -- * test/ruby/test_io_m17n.rb (test_textmode_paragraph_nonasciicompat): should match the modes of both end of pipe as text mode. * test/ruby/test_io_m17n.rb (test_binmode_paragraph_nonasciicompat): new test for binmode. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28603 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 aeb0b102bc..08c3ac27bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul 4 17:13:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (swallow, prepare_getline_args, rb_io_getline_1): fix for
+ paragraph mode reading in non-ascii-compatible encoding.
+ [ruby-dev:41803]
+
Sat Jul 10 11:41:54 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/psych/test_date_time.rb (TestDateTime#test_round_trip_with_offset):