summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 09:40:33 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 09:40:33 +0000
commit9e557661c24d13051b6ef180028cc173433e6b2e (patch)
tree6b7bef785c557d7cc4852dbaafc70e0e44c04c42 /ChangeLog
parente57e5c5b07762dd7983adc87c2a278449423659e (diff)
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26016 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 16c470434a..9d4d6f32b2 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