mycroft
Mon Jun 13 15:12:16 PDT 1994
Update of /b/source/CVS/src/usr.bin/fstat
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.bin/fstat

Modified Files:
	Makefile fstat.1 fstat.c 
Log Message:
Merge local changes.

mycroft
Mon Jun 13 15:17:29 PDT 1994
Update of /b/source/CVS/src/usr.sbin/bad144
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.sbin/bad144/t

Revision/Branch: 1.1.1

Log Message:
Update from 4.4-Lite.

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.sbin/bad144/bad144.8
C src/usr.sbin/bad144/Makefile
C src/usr.sbin/bad144/bad144.c

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/bad144


------------------------------------------------------------------------------