merge revision(s) 16379:

	* win32/win32.c (rb_w32_select): backport from trunk.
	  [ruby-talk:300743]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a659250a8..783c7ca42f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 22:49:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_select): backport from trunk.
+	  [ruby-talk:300743]
+
 Sun Jun 15 22:47:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/delegate.rb (SimpleDelegator::dup): removed needless argument.