nobu	2008-05-17 23:50:38 +0900 (Sat, 17 May 2008)

  New Revision: 16449

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/file.c
    branches/ruby_1_8_5/version.h
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/file.c
    branches/ruby_1_8_6/version.h

  Log:
    * file.c (OpenFile): prevent conflict on Windows.
    
    * file.c (USE_NTFS): fixed merge miss.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/file.c?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16449&r2=16448&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/file.c?r1=16449&r2=16448&diff_format=u