From c8b917603af9a55046fcc9af8171183d280fb9dd Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Dec 2008 08:54:37 +0000
Subject: merges r20458 and r20459 from trunk into ruby_1_9_1. * io.c
 (rb_io_getc, rb_io_readchar): documentation correction from   Emiel van de
 Laar.  [ruby-core:20212]

* ext/stringio/stringio.c (strio_ungetbyte): ditto.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 177ed95a4..89a37448c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec  3 12:24:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getc, rb_io_readchar): documentation correction from
+	  Emiel van de Laar.  [ruby-core:20212]
+
+	* ext/stringio/stringio.c (strio_readchar): ditto.
+
 Wed Dec  3 09:26:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/xpath.rb (REXML::XPath.first): apply documentation
-- 
cgit