Mike Pritchard
76918e1ad4
Merge to resolve conflicts with file 3.22 merge.
1997-03-18 19:37:41 +00:00
Peter Wemm
53faa0dade
Revert $FreeBSD$ to $Id$
1997-02-22 19:29:21 +00:00
Jordan K. Hubbard
1130b656e5
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
Mike Pritchard
a0f4ffca81
Merged changes to resolve conflicts with file 3.19 import.
1996-01-23 12:40:36 +00:00
Rodney W. Grimes
7799f52a32
Remove trailing whitespace.
1995-05-30 06:41:30 +00:00
Geoff Rehmet
c7510038dc
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
