From: Micah Cowan Date: Tue, 9 Oct 2007 18:17:02 +0000 (-0700) Subject: Merge with mainline. X-Git-Tag: v1.13~516^2~11 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=4b1a1b7fe1aeebc8e067f13ef67ce1708aa477b5;hp=e100ff5403b9e6e6a888f71ec832ce3488baf09d Merge with mainline. --- diff --git a/AUTHORS b/AUTHORS index 49a48ca6..219877e9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -42,3 +42,6 @@ Daniel Stenberg. NTLM authentication in http-ntlm.c and http-ntlm.h originally written for curl donated for use in GNU Wget. Micah Cowan. Current Wget maintainer, from mid-2007. + +Ralf Wildenhues. Contributed patches to convert Wget to use Automake as +part of its build process, and various bugfixes. diff --git a/ChangeLog b/ChangeLog index 3105fee9..72da9a52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ * po/quot.sed: New file, from gettext-0.16.1. * po/remove-potcdate.sin: New file, from gettext-0.16.1. +2007-10-08 Micah Cowan + + * AUTHORS: Credit to Ralf Wildenhues for automakifying patches. 2007-10-05 Ralf Wildenhues diff --git a/doc/ChangeLog b/doc/ChangeLog index 176e435b..0989f76e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2007-10-08 Micah Cowan + + * wget.texi: Credit to Ralf Wildenhues for automakifying patches. + 2007-10-05 Ralf Wildenhues * Makefile.in: Removed, replaced by Makefile.am. diff --git a/doc/wget.texi b/doc/wget.texi index a8ca8406..0f66f17b 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -3674,6 +3674,10 @@ Christopher G.@: Lewis---Maintenance of the Windows version of GNU WGet. Gisle Vanem---Many helpful patches and improvements, especially for Windows and MS-DOS support. +@item +Ralf Wildenhues---Contributed patches to convert Wget to use Automake as +part of its build process, and various bugfixes. + @item People who provided donations for development---including Brian Gough. @end itemize