mycroft
Mon Jun 13 15:03:59 PDT 1994
Update of /b/source/CVS/src/usr.sbin/quotaon
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.sbin/quotaon/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/quotaon/quotaon.8
C src/usr.sbin/quotaon/Makefile
C src/usr.sbin/quotaon/quotaon.c

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

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


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

Modified Files:
	Makefile quotaon.8 quotaon.c 
Log Message:
Merge local changes.

mycroft
Mon Jun 13 15:05:38 PDT 1994
Update of /b/source/CVS/src/usr.sbin/repquota
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.sbin/repquota/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/repquota/repquota.8
C src/usr.sbin/repquota/repquota.c
C src/usr.sbin/repquota/Makefile
I src/usr.sbin/repquota/tags

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

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


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

Modified Files:
	Makefile repquota.8 repquota.c 
Log Message:
Merge local changes.

mycroft
Mon Jun 13 15:09:15 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/t

Revision/Branch: 1.1.1

Log Message:
Update from 4.4-Lite.

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
U src/usr.bin/fstat/Makefile
U src/usr.bin/fstat/fstat.c
U src/usr.bin/fstat/fstat.1

No conflicts created by this import


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