*** empty log message ***

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 07fab530e64f00d369354696bac9c5157b7f5f0c..2b5ec2d44360dcb5667cfe9ab5ae1380d6c175f9 100644 (file)
--- 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