Automated merge.

[wget] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index fabc8b8f7e9d8cc66266a1e102dca458b9dc6045..0c60ebfb1869e29ebe6b886e2f2eea47c88be5c1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,16 @@
        separate parameters, one input (passed_expected_bytes) and one
        output (qtyread). Fixes bug #26870.
 
+2009-09-05  Steven Schubiger  <stsc@member.fsf.org>
+
+       * retr.h: Declare set_local_file() to avoid build warnings.
+
+2009-09-05  Gisle Vanem  <gvanem@broadpark.no>
+
+       * connect.c, init.c, main.c, openssl.c, options.h:  Replace
+       "ifdef MSDOS" with "ifdef USE_WATT32" since DOS-targets in fact
+       use the Watt-32 tcp/ip stack.
+
 2009-09-04  Micah Cowan  <micah@cowan.name>
 
        * Makefile.am: Move build_info.c to wget_SOURCES from