diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 09:23:01 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 09:23:01 +0000 |
| commit | 42569dd48e76824da8bfde04852b3af4de2b1a67 (patch) | |
| tree | 4ad719e737e67ec57677eb27e8993586ac5c2850 /ChangeLog | |
| parent | 59fadede2bbfa78362e81680e416fdce54e27baf (diff) | |
merge revision(s) 54423,54489: [Backport #12201] [Backport #12202]
* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
patched by Anton Sivakov [Bug #12201] [Bug #12202]
* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
[Bug #12202] [ruby-core:74802]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,13 @@ +Fri Apr 22 18:22:15 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo. + [Bug #12202] [ruby-core:74802] + +Fri Apr 22 18:22:15 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. + patched by Anton Sivakov [Bug #12201] [Bug #12202] + Fri Apr 22 18:19:32 2016 Naotoshi Seo <sonots@gmail.com> * ext/date/date_core.c (datetime_to_time): preserve timezone info |