summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 17:22:04 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 17:22:04 +0000
commit50864b9d019e2dfd5fb43c5e4ea50917ba2d3f4a (patch)
tree6c1ec38446a8587525d84d471234246e154d1703 /ChangeLog
parent710fe14b5d1e00f9ae2d3fb49670b91a27dbe233 (diff)
merge revision(s) 54256,54291,54292,54293: [Backport #12118] [Bug #12218]
* thread_pthread.c (reserve_stack): fix reserving position where the stack growing bottom to top. [Bug #12118] * localeinit.c (rb_locale_charmap_index): fix prototype. patched by Andreas Schwab [Bug #12218] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 543e2bbeec..6c70385595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Mar 30 02:20:06 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * localeinit.c (rb_locale_charmap_index): fix prototype.
+ patched by Andreas Schwab [Bug #12218]
+
+Wed Mar 30 02:20:06 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * thread_pthread.c (reserve_stack): fix reserving position where
+ the stack growing bottom to top. [Bug #12118]
+
Wed Mar 30 02:17:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/file.c (rb_readlink): drop garbage after the substitute