*** empty log message ***

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 32365d94c417efe4add7e9a8851fd58c4858f3f1..da95230e97f14678b65ca0924b8278d391297c1d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,9 @@
 2003-06-06  Jim Meyering  <jim@meyering.net>
 
+       Merge from coreutils.
+       * fsusage.c: Remove declaration of statfs.
+       It conflicted with one from OSF/1 5.1 in <sys/mount.h>.
+
        * posixtm.c: Include <stdbool.h> unconditionally.
 
 2003-06-05  Paul Eggert  <eggert@twinsun.com>