*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index f05d0e9bd5361754931382585e70a68e9e262ce6..3314692a2461c126e7cbdf4c2dfae93fb08a901a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-2005-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+2005-11-08  Jim Meyering  <jim@meyering.net>
 
        * Version 6.0-cvs.
 
+       * NEWS: Merge in changes from b5_9x branch.
+
+2005-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+
        * NEWS: ls now defaults to --time-style='locale', which in turn acts
        like --time-style='posix-long-iso' if the locale settings are messed up.
        * src/ls.c (decode_switches): Implement this.