diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 15:39:27 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 15:39:27 +0000 |
| commit | 9224427bb5a483bb383c755f33a1d80867a7aa16 (patch) | |
| tree | df834b6b69304ef7c9829c49bec87a5c5890073f /ChangeLog | |
| parent | a8acc95f4c3b3b6ead0586139e4205326e0bc029 (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_3@54714 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 @@ +Sat Apr 23 00:33:04 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo. + [Bug #12202] [ruby-core:74802] + +Sat Apr 23 00:33:04 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. + patched by Anton Sivakov [Bug #12201] [Bug #12202] + Sat Apr 23 00:29:15 2016 NARUSE, Yui <naruse@ruby-lang.org> * lib/securerandom.rb (gen_random): to avoid blocking on Windows. |