aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-16 13:29:20 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-16 13:29:20 +0000
commit020ff711ce5cea15d7c4927e730f8ba11d16f989 (patch)
tree8e00ec3a859b461ff15cd9044145dcecd6953395 /ChangeLog
parentc3e8cca95040dbae915cad793ccb72f56021bd4a (diff)
downloadruby-020ff711ce5cea15d7c4927e730f8ba11d16f989.tar.gz
fix typos [ci skip]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
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 <ko1@atdot.net>
* 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 <ko1@atdot.net>
Thu Jul 16 21:47:47 2015 Naohisa Goto <ngotogenome@gmail.com>
- * 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]