Automated merge.

[wget] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index d82f1fcd63fe119135015de6c22752b0cd85beb1..9af9267b4495c37851f5d0fac24aeb40bb2a969d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2008-06-13  Micah Cowan  <micah@cowan.name>
+
+       * build_info.c: ENABLE_NTLM, not HAVE_NTLM.
+
+2008-06-13  Madhusudan Hosaagrahara <com.gmail.hrmadhu>
+
+       * Makefile.am, main.c, init.c, init.h, build_info.c: Adds build
+       information to the --version command line option. Fixes bug
+       #20636.
+
+2008-06-01  Micah Cowan  <micah@cowan.name>
+
+       * main.c [WINDOWS]: Reopen stdout in binary mode, when -O - is
+       given.
+
 2008-05-31 Micah Cowan  <micah@cowan.name>
 
        * html-url.c, http.c: Avoid casts in a couple spots.