From 01acbfa1a52ac571f32f2ee21279c664dc57eff3 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 6 Oct 2004 09:04:20 +0000
Subject: [PATCH] updates of today

---
 CHANGES       | 6 ++++++
 RELEASE-NOTES | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index 23422f6c8..47daa98fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Daniel (6 October 2004)
+- Dan Fandrich fixed a configure flaw for systems that need both nsl and socket
+  libs to use gethostbyname().
+
+- Removed tabs and trailing whitespace from lots of source files.
+
 Daniel (5 October 2004)
 - Made configure --with-libidn=PATH try the given PATH before the default
   paths to make it possible to override.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1d265defa..7bf65dc02 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o configure's gethostbyname check when both nsl and socket libs are required
  o configure --with-libidn now checks the given path before defaults
  o a race condition sometimes resulting in CURLE_COULDNT_RESOLVE_HOST in the
    windows threaded name resolver code