summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-24 16:09:58 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-24 16:09:58 +0000
commit38535a30f278ce58fcc572e51844515c1274cc3d (patch)
tree2834b400e05caabc70eb464e7cd8ad887d4d32b8 /ChangeLog
parent0ec0eb9c5ad780e9aa01b87e0c67144361e0d57c (diff)
merge revision(s) 52694: [Backport #3231]
* ext/digest/sha1/sha1ossl.c: fix defs.h path to catch up changes in r52739.[Bug #3231] * ext/digest/rmd160/rmd160ossl.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d3b7aff6a1..c19151225a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 25 01:05:29 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ * ext/digest/sha1/sha1ossl.c: fix defs.h path to catch up changes in
+ r52739.[Bug #3231]
+
+ * ext/digest/rmd160/rmd160ossl.c: ditto.
+
Wed Nov 25 00:54:15 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (kwd_append): fix segv after invalid keyword argument,