shyouhei	2008-06-15 20:29:46 +0900 (Sun, 15 Jun 2008)

  New Revision: 17212

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/Win32API/lib/win32/registry.rb
    branches/ruby_1_8_5/ext/Win32API/lib/win32/resolv.rb
    branches/ruby_1_8_5/lib/resolv.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15823:
    * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
      [ruby-dev:29945], [ruby-dev:34095]
    * lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
      name too for cygwin.  [ruby-dev:29945]
    * lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/Win32API/lib/win32/resolv.rb?r1=17212&r2=17211&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/Win32API/lib/win32/registry.rb?r1=17212&r2=17211&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17212&r2=17211&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17212&r2=17211&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/resolv.rb?r1=17212&r2=17211&diff_format=u