diff --git a/ChangeLog b/ChangeLog index de0961a71a..7324454287 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ Thu Jul 16 22:05:29 2015 Koichi Sasada * vm_core.h: constify rb_iseq_t::parent_iseq. rb_iseq_t::local_iseq is not constant data because - local_iseq::flip_cnt can be modified (commentted). + local_iseq::flip_cnt can be modified (commented). * compile.c: catch up this fix. @@ -13,7 +13,7 @@ Thu Jul 16 22:05:29 2015 Koichi Sasada Thu Jul 16 21:47:47 2015 Naohisa Goto - * process.c (redirect_dup2): when the new FD of dup2() coflicts + * process.c (redirect_dup2): when the new FD of dup2() conflicts with one of the timer thread FDs, the internal FD is diverted. [Bug #11336] [ruby-core:69886] [Bug #11350] [ruby-core:69961]