6 Commits

Author	SHA1	Message	Date
mpp	2405937481	Merge to resolve conflicts with file 3.22 merge.	1997-03-18 19:37:41 +00:00
peter	1616dd447f	Revert $FreeBSD$ to $Id$	1997-02-22 19:29:21 +00:00
jkh	9c0cd3f9df	Make the long-awaited change from $Id$ to $FreeBSD$ ... This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise.	1997-01-14 07:20:47 +00:00
mpp	ff607b128e	Merged changes to resolve conflicts with file 3.19 import.	1996-01-23 12:40:36 +00:00
rgrimes	79e59e9123	Remove trailing whitespace.	1995-05-30 06:41:30 +00:00
csgr	8d1a4c7e86	Bring in file 3.14 by Ian Darwin (and Christos Zoulas) ... The following files were moved to different names: - file.man -> file.1 - magic.man -> magic.5 The following file was removed: - Magdir/Makefile	1994-09-03 19:16:28 +00:00