* file.c (OpenFile): prevent conflict on Windows.

* file.c (USE_NTFS): fixed merge miss.


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

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f8e0ee0091..06f3525066 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 17 23:50:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (OpenFile): prevent conflict on Windows.
+
+	* file.c (USE_NTFS): fixed merge miss.
+
 Sat May 17 12:36:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): rb_str_set_len is not backported.