If -nc and -k are used at the same time, use only the latter

[wget] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index fb3d99447e25a83f84c364c9a4225ab5655e7599..994f8957d95661ed1abd6cd1b413d8aeab964ee6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-09  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * main.c (main): If --no-clobber and --convert-links are used at the
+       same time, use only the latter.
+       Reported by: Romain Vimont <rom@rom1v.com>
+
+2010-12-07  Jessica McKellar <jesstess@mit.edu> (tiny change)
+
+       * main.c: Make help message clearer.
+
+2010-12-02  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * build_info.c.in: Do not list md5.
+
 2010-12-01  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * cmpt.c: Include <unistd.h> inconditionally.