Merging heads.

[wget] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ad4c460c6bb45ec7f4c3abaf21386cc9868e2f97..1a20b3c6186bf140767485152f2ad0571981f260 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2008-05-15  Micah Cowan  <micah@cowan.name>
+
+       * 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'.
+       conjunction with '-O file'.
 
 2008-05-12  Micah Cowan  <micah@cowan.name>
 
@@ -11,6 +15,45 @@
 
        * NEWS: Added documentation for changes made in 1.11.2.
 
+2008-04-30  Steven Schubiger  <stsc@members.fsf.org>
+
+       * lib/getdelim.c, lib/getline.c, lib/getpass.c,
+       lib/getpass.h, lib/realloc.c, lib/stdio.h,
+       lib/stdio.in.h, lib/stdlib.h, lib/stdlib.in.h: Imported 
+       from gnulib.
+       * m4/eoverflow.m4, m4/extensions.m4, m4/getdelim.m4, 
+       m4/getline.m4, m4/getpass.m4, m4/malloc.m4, m4/realloc.m4, 
+       m4/stdio_h.m4, m4/stdlib_h.m4: Imported from gnulib.
+       * md5/stdint.h: Imported from gnulib.
+       
+       * GNUmakefile: Updated from gnulib.
+       * lib/Makefile.am, lib/getopt.c, lib/unistd.in.h: Updated
+       from gnulib.
+       * m4/gnulib-cache.m4, m4/gnulib-common.m4, m4/gnulib-comp.m4,
+       m4/include_next.m4, m4/unistd_h.m4: Updated from gnulib.
+       * md5/Makefile.am, md5/m4/gnulib-cache.m4, md5/m4/gnulib-common.m4,
+       md5/m4/gnulib-comp.m4, md5/m4/include_next.m4, md5/m4/md5.m4,
+       md5/m4/stdint.m4, md5/md5.c, md5/md5.h, md5/stdint.in.h,
+       md5/wchar.in.h: Updated from gnulib.
+ 
+2008-04-14  Micah Cowan  <micah@cowan.name>
+
+       * GNUmakefile, lib/Makefile.am, lib/error.c, lib/error.h,
+       lib/exitfail.c, lib/exitfail.h, lib/getopt.c, lib/intprops.h,
+       lib/quote.c, lib/quote.h, lib/quotearg.c, lib/quotearg.h,
+       lib/stdlib.in.h, lib/strerror.c, lib/string.in.h,
+       lib/unistd.in.h, lib/wchar.in.h, lib/wctype.in.h,
+       lib/xalloc-die.c, lib/xalloc.h, lib/xmalloc.c, m4/error.m4,
+       m4/exitfail.m4, m4/extensions.m4, m4/gnulib-cache.m4,
+       m4/gnulib-comp.m4, m4/include_next.m4, m4/inline.m4,
+       m4/mbrtowc.m4, m4/mbstate_t.m4, m4/quote.m4, m4/quotearg.m4,
+       m4/stdlib_h.m4, m4/strerror.m4, m4/string_h.m4, m4/unistd_h.m4,
+       m4/wchar.m4, m4/wctype.m4, m4/wint_t.m4, m4/xalloc.m4,
+       md5/Makefile.am, md5/m4/gnulib-cache.m4, md5/m4/gnulib-comp.m4,
+       md5/m4/include_next.m4, md5/m4/md5.m4, md5/m4/stdint.m4,
+       md5/md5.c, md5/md5.h, md5/stdint.in.h, md5/wchar.in.h: Update
+       from Gnulib, and add the "quote" module.
+
 2008-03-20  Micah Cowan  <micah@cowan.name>
 
        * ABOUT-NLS: Reinstated, but with a message mentioning that