summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-27 04:13:58 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-27 04:13:58 +0000
commit77f483e3ffc0711c90f793ecefb376939d1e595b (patch)
tree6db09a78e7e977e4c4487a18171620aa995889bf /ChangeLog
parent275a793c28c00b6b4a8e499db3db8fce71d97a17 (diff)
downloadruby-77f483e3ffc0711c90f793ecefb376939d1e595b.tar.gz
ruby-77f483e3ffc0711c90f793ecefb376939d1e595b.tar.xz
ruby-77f483e3ffc0711c90f793ecefb376939d1e595b.zip
* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 092bfbf4c..d70eee806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+<<<<<<< .mine
+Tue May 27 13:12:37 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+
Tue May 27 12:06:37 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (BUFCHECK): wrong condition. [ruby-core:16921]