summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-18 05:42:40 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-18 05:42:40 +0000
commitf7f765ee306bf499fe4c3e02e76e926bc67f6f5f (patch)
tree6130d62e8083a0ba56a52d67ef1c2fdb74e9600b /ChangeLog
parent84d71259e63f67578b6b0f23199417bc3681a299 (diff)
merges r29023 from trunk into ruby_1_9_2.
-- * regcomp.c: revert r26701; it introduces Bug #3681. [ruby-core:31677] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29029 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 59673c44ec..fb1dc55672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 18 01:37:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regcomp.c: revert r26701; it introduces Bug #3681.
+ [ruby-core:31677]
+
Mon Aug 16 23:16:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
* NEWS: updated. a patch from Kazuhiro NISHIYAMA in [ruby-dev:42001].