summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-28 14:15:54 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-28 14:15:54 +0000
commitf0739b6f1e30a8328696767c8b99dad9fd249346 (patch)
treecb06db0570933f410b0ca69130e9f9fdfe6858e3 /ChangeLog
parent3f21c1cdb145fcb6106d77e6c7415e3fcaf8c91e (diff)
merges r24616 from trunk into ruby_1_9_1.
-- * thread.c (rb_check_deadlock): decrease number of sleepers before deadlock detection because the deadlock exception makes main thread run. [ruby-dev:39142] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 02a3603e6..66389f05c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 22 00:03:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread.c (rb_check_deadlock): decrease number of sleepers before
+ deadlock detection because the deadlock exception makes main thread
+ run. [ruby-dev:39142]
+
Fri Aug 21 15:01:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
* ext/readline/readline.c (readline_readline): use rb_prep_terminal