summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-04 06:34:08 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-04 06:34:08 +0000
commit1a70fe690870fc90bdd7702f9637cd953ad6a522 (patch)
tree20d84e434e5c57ecfd8c8e0cd1d027b31b2666fb /ChangeLog
parentde7048ce904132c1e80d3a66ea1ae02cb93c5216 (diff)
merge revision(s) 29933:
* re.c (rb_reg_regcomp): should succeed the taint status from the origin. [ruby-core:33338] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30080 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 e830a2d2a1..10a71ebc82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 4 11:25:02 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * re.c (rb_reg_regcomp): should succeed the taint status from the
+ origin. [ruby-core:33338]
+
Thu Dec 2 21:13:42 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* Makefile.in (fake.rb): need to expand the topdir in case of it