aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-17 03:20:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-17 03:20:02 +0000
commit1d7dc02647c13c8f3884fcaa80b7f11415205384 (patch)
tree8cf5d66c6b063634373f0dda9a48cb1fe093ca39 /ChangeLog
parent76bc2d1ed7f13fb329c33f48756ea3c24c59a6ea (diff)
downloadruby-1d7dc02647c13c8f3884fcaa80b7f11415205384.tar.gz
* io.c: Fix a mistake on merging the patch in the previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 554db48721..7992709b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 17 12:18:47 2012 Yuki Yugui Sonoda <yugui@google.com>
+
+ * io.c: Fix a mistake on merging the patch in the previous commit.
+
Thu May 17 11:33:07 2012 Yuki Yugui Sonoda <yugui@google.com>
Imports Ruby's port to NativeClient (a.k.a NaCl).