summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-03 01:00:23 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-03 01:00:23 +0000
commit6bdde0e5e612befe47c0a4e87f4900dbb106f78e (patch)
tree57a32461394f61f9442dccb1f052d141efd5a99e /ChangeLog
parent9e736114eb489293a3708d04efed3cb492de6f92 (diff)
merge revision(s) 33468:
* ext/pty/pty.c (pty_check): should return nil until the child terminates or stops. [ruby-dev:44600] [Bug #2642] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34183 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 46f44e2eb0..03f282a02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 2 20:00:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/pty/pty.c (pty_check): should return nil until the child
+ terminates or stops. [ruby-dev:44600] [Bug #2642]
+
Mon Jan 2 19:27:18 2012 Yusuke Endoh <mame@tsg.ne.jp>
* thread.c (update_coverage): skip coverage count up if the current