Automated merge.

[wget] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 659415aa5c1ea3237eb2ff7bfe721639af1c14fe..330d4c6cb14c1c6f130719fca2c359ffe7443c50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-07-03  Micah Cowan  <micah@cowan.name>
+
+       * configure.ac: Ensure LIBICONV is empty if IRIs are disabled.
+
+       * AUTHORS: Added Ted Mielczarek and Saint Xavier.
+
+       * NEWS: Added items for IRI support, new --version information.
+
+2009-07-01  Steven Schubiger  <stsc@member.fsf.org>
+
+       * Makefile.am: Add build_info.pl to EXTRA_DIST.
+
+       * build_info.pl: Generate build_info.c from data.
+
 2009-06-14  Micah Cowan  <micah@cowan.name>
 
        * po/Makefile.in.in (distclean): remove en_US.po, too.