From: Jim Meyering <jim@meyering.net>
Date: Sun, 12 Mar 2000 20:04:35 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: SH-UTILS-2_0g~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83a446e62ab0578fd338bde5a2626d65e1336ace;p=thirdparty%2Fcoreutils.git

*** empty log message ***
---

diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index db09e96696..72bbb85dc4 100644
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -1,5 +1,16 @@
 2000-03-12  Jim Meyering  <meyering@lucent.com>
 
+	Merge with fileutils.
+	* src/system.h "pathmax.h": Include.
+	<sys/time.h>: Include if appropriate.
+	<time.h>: Likewise.
+	<sys/mkdev.h>: Likewise.
+	<sys/sysmacros.h>: Likewise.
+	<utime.h>: Likewise.
+	(major, minor, makedev): Define if needed.
+	(struct utimbuf): Declare if missing.
+	(ST_BLKSIZE, ST_NBLOCKS, ST_NBLOCKSIZE): Define.
+
 	* src/cksum.c (usage): Correct --help output.
 	Prompted by a report from Gregory Leblanc.