From 7aae3bd3c37b3f399aa55325a37c8428e5981e2d Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Dec 2009 09:40:33 +0000
Subject: merges r25133 from trunk into ruby_1_9_1. c.f. [ruby-dev:39819] -- *
 win32/wini32.c (LK_ERR): with overlapped I/O, LockFileEx() returns  
 ERROR_IO_PENDING if the file is locked.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 16c470434..9d4d6f32b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 28 19:36:20 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/wini32.c (LK_ERR): with overlapped I/O, LockFileEx() returns
+	  ERROR_IO_PENDING if the file is locked.
+
 Mon Nov 23 04:12:00 2009  Tanaka Akira  <akr@fsij.org>
 
 	* enc/trans/newline.trans (fun_so_universal_newline): generate \n
-- 
cgit