1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f2b25a3633..1e75ed02e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Nov  2 12:55:50 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_{pthread,win32}.c (native_stop_timer_thread): join the thread
+	  here.
+
+	* thread_{pthread,win32}.c (native_reset_timer_thread): new function.
+
+	* thread.c (rb_thread_stop_timer_thread, rb_thread_reset_timer_thread):
+	  call above function instead of simply seting 0.
+
 Mon Nov  2 11:22:19 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/dl/win32/lib/win32/registry.rb: update rdoc. [ruby-core:26022]