Merging heads.

[wget] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 697f2ca6da2f469ccdc5b85e5731f946ec12da33..1a20b3c6186bf140767485152f2ad0571981f260 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
        * NEWS: Entry for --ask-password.
 
+2008-05-14  Joao Ferreira  <joao@joaoff.com>
+
+       * src/main.c, src/http.c, src/ftp.c: -nc is now working in 
+       conjunction with '-O file'.
+
 2008-05-12  Micah Cowan  <micah@cowan.name>
 
        * NEWS: Translations and -N/-O.