summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 07fab530e..2b5ec2d44 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-04 Jim Meyering <jim@meyering.net>
+
+ Merge from glibc.
+ * fts.c (fts_open): Avoid function call in MAX macro use.
+
2006-01-03 Paul Eggert <eggert@cs.ucla.edu>
* xtime.h (xtime_make, xtime_nonnegative_nsec, xtime_nsec): Use