From: Micah Cowan <micah@cowan.name>
Date: Tue, 9 Oct 2007 07:14:33 +0000 (-0700)
Subject: Automated merge with file:/home/micah/devel/wget/fix-double-gets
X-Git-Tag: v1.13~518
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=aa4991b8f74668f04b0ea5e2a73607df3150b257

Automated merge with file:/home/micah/devel/wget/fix-double-gets
---

aa4991b8f74668f04b0ea5e2a73607df3150b257
diff --cc src/ChangeLog
index 6b742600,6864760e..f3b0e539
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -12,6 -12,6 +12,14 @@@
  	support isn't on; make sure we continue properly in that case,
  	even though we're not sending HEAD.
  
++2007-10-02  Gisle Vanem  <gvanem@broadpark.no>
++	
++	* ftp.c: Use "_listing" for MSDOS (".listing" is illegal).
++
++	* url.c: Update comment for 'filechr_not_windows'.
++
++	* utils.c: Include <process.h> for 'getpid()' on Watcom.
++
  2007-10-02  Micah Cowan  <micah@cowan.name>
  
  	* ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main