*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index ed9ca60df9e5e8254100ef9e34b3c22ea84708df..bce7f7f9aaf31f1f7fb13d7452f4c12d701ddd36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
-2005-02-14  Paul Eggert  <eggert@cs.ucla.edu>
+2005-02-15  Jim Meyering  <jim@meyering.net>
 
        * Version 5.3.1.
 
+       * src/nice.c (NZERO) [NZERO == 0]: Undefine and define to 20,
+       to work around the invalid definition from Darwin 7.7.0.
+       Test failure reported by Sébastien Maret.
+
+2005-02-14  Paul Eggert  <eggert@cs.ucla.edu>
+
        * src/sort.c (mergefps): Use binary search rather than linear one
        when comparing new line to lines already in main memory.
        Idea suggested by James Lemley.