diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-17 05:56:35 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-17 05:56:35 +0000 |
| commit | 58ff66b18b676293108a625f161342a7a4755df9 (patch) | |
| tree | 5c9048e3d392cce71cf2133b2e5e77086e0b5741 /ChangeLog | |
| parent | 9f67424dc97e2b99d98b71d08178681f0240ee86 (diff) | |
merge revision(s) 46391,46395: [Backport #9766]
* lib/csv.rb (CSV#<<): honor explicity given encoding. based on
the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
[ruby-core:62113]. [Bug #9766]
* lib/csv.rb (CSV#<<): honor explicitly given encoding. based on
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Wed Sep 17 14:52:38 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/csv.rb (CSV#<<): honor explicitly given encoding. based on + the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at + [ruby-core:62113]. [Bug #9766] + Fri Sep 12 11:34:39 2014 Koichi Sasada <ko1@atdot.net> * test/ruby/test_object.rb: extend timeout. |