summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-25 15:06:14 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-25 15:06:14 +0000
commitfc6dd7dbc7f24ce9b1903a7228942a5da399552a (patch)
treef720fd9d8c0088ded1a84a9699469fe8e8fae0d4 /ChangeLog
parent6f6a076086f85942bb5eb22a4fda275a25dbe59f (diff)
merge revision(s) r45512,r45513,r45515: [Backport #9698]
configure.in: indent * configure.in (ac_cv_func___builtin_setjmp): adjust indent. * configure.in (ac_cv_func___builtin_setjmp): should not skip flags restoration in RUBY_WERROR_FLAG by `break`. [ruby-dev:48086] [Bug #9698] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cf6df4eb6..7876784187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 26 00:06:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (ac_cv_func___builtin_setjmp): should not skip
+ flags restoration in RUBY_WERROR_FLAG by `break`.
+ [ruby-dev:48086] [Bug #9698]
+
Tue Aug 26 00:02:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ac_cv_func___builtin_setjmp): __builtin_longjmp()