1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0712bd83b7..3398eb29c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Nov 26 20:23:20 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_join_m): use th->interrupt_mask instead of
+	  th->in_trap.
+
+	* vm_core.h (struct rb_thread_struct): remove in_trap member.
+	* signal.c (signal_exec): ditto.
+	* thread.c (thread_create_core): ditto.
+	* thread.c (Init_Thread): ditto.
+
 Mon Nov 26 20:23:49 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is