Merge with mainline

[wget] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index f3e930a7162358fcfb63ae044464c7943e2df416..d9223c5f02c310ac80ed2f2d1df14acf11b80251 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,18 @@
+2007-10-02  Micah Cowan  <micah@cowan.name>
+
+       * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main
+       (main): Use datetime_str instead of time_str, for those who have
+       potentially long-running sessions.
+
 2007-09-25  Micah Cowan  <micah@cowan.name>
 
        * Makefile.in: Use EXEEXT instead of exeext.
 
+2007-09-24  Gisle Vanem  <giva@bgnett.no>
+
+       * connect.c, init.c, main.c, openssl.c, options.h, sysdep.h,
+       url.c, utils.c: Added support for building on MS-DOS.
+
 2007-09-24  Jochen Roderburg  <roderburg@uni-koeln.de>
 
        * http.c (http_zero): Remove no-longer-used local_size variable.