diff --git a/ChangeLog b/ChangeLog index f05d0e9bd..3314692a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ -2005-11-08 Paul Eggert +2005-11-08 Jim Meyering * Version 6.0-cvs. + * NEWS: Merge in changes from b5_9x branch. + +2005-11-08 Paul Eggert + * 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.