summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2005-11-08 21:11:00 +0000
committerJim Meyering <jim@meyering.net>2005-11-08 21:11:00 +0000
commitc5ad46e57fc2e88090624cc0283d9f7c93648b2b (patch)
treed6d1ed1c579fb212ccaa9b53e32d6d1b2b9ac669 /ChangeLog
parent8b5df581404ec0061dc26195021916016031bd08 (diff)
downloadcoreutils-c5ad46e57fc2e88090624cc0283d9f7c93648b2b.tar.xz
*** empty log message ***
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f05d0e9bd..3314692a2 100644
--- 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.