summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-14 07:51:55 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-14 07:51:55 +0000
commitc6c5a44bcb81ddc72f31a57ee379ec66ce3f9bf9 (patch)
tree6265344a2ff103f9644799b260062e77cfab5ca1 /ChangeLog
parent1454c9812becc4d64bb319cb76a2563c69a2ec5e (diff)
merge revision(s) 15464:
* lib/timeout.rb (Timeout::timeout): made sensitive to location on the stack. [ruby-core:15458] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17158 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 18665b95e7..dcb55ae763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 14 16:49:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/timeout.rb (Timeout::timeout): made sensitive to location on the
+ stack. [ruby-core:15458]
+
Fri Jun 13 13:14:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/dl/ptr.c (dlmem_each_i): typo fixed. a patch from IKOMA