4 Commits

Author	SHA1	Message	Date
mpp	c80207ab49	Merge to resolve conflicts with file 3.22 merge.	1997-03-18 19:37:41 +00:00
peter	ca6ca83982	Revert $FreeBSD$ to $Id$	1997-02-22 19:29:21 +00:00
jkh	808a36ef65	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
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