summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-12 02:32:58 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-12 02:32:58 +0000
commit97acdd71435d062541510ba68fe6a33e7431e8a1 (patch)
tree61f3dc15b7bce5a70f38e0d93590ccbfeb1d270f /ChangeLog
parentc6a2b2e11c5c82042015f45e29addc7022f7365b (diff)
* regcomp.c: Merge Onigmo 988517a4f16f14acbd7cc9d5b51a096d5153992c.
[Bug #9344]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7efd56df51..19f52ea8f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 12 11:30:50 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * regcomp.c: Merge Onigmo 988517a4f16f14acbd7cc9d5b51a096d5153992c.
+ [Bug #9344].
+
Fri Sep 12 11:22:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (Doxyfile): revert r43888, not to require preinstalled