diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-18 05:26:07 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-18 05:26:07 +0000 |
| commit | 58f269d070fb404f7e78ee7153a01462ab87bdb9 (patch) | |
| tree | 0ed5dc8495b5b0997212b09da6f750fae08dd4ef /ChangeLog | |
| parent | 815d88b569d9b2ceb480c7ce76b429257199a5c7 (diff) | |
merge revision(s) 34433: [Backport #6153]
* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
is ascii only string. [ruby-core:42354] [Bug #5968]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sun Mar 18 13:23:28 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string + is ascii only string. [ruby-core:42354] [Bug #5968] + Tue Mar 6 18:55:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/test/unit/assertions.rb (assert_send, assert_not_send): |