mycroft
Mon Jun 13 14:32:14 PDT 1994
Update of /b/source/CVS/src/usr.bin/quota
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.bin/quota

Revision/Branch: 1.1.1

Log Message:
Update from 4.4-Lite.

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
I src/usr.bin/quota/CVS
C src/usr.bin/quota/Makefile
C src/usr.bin/quota/quota.1
C src/usr.bin/quota/quota.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/quota


mycroft
Mon Jun 13 14:33:24 PDT 1994
Update of /b/source/CVS/src/usr.bin/quota
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.bin/quota

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

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

Revision/Branch: 1.1.1

Log Message:
Update from 4.4-Lite.

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
I src/usr.sbin/edquota/CVS
C src/usr.sbin/edquota/Makefile
C src/usr.sbin/edquota/edquota.8
C src/usr.sbin/edquota/edquota.c
C src/usr.sbin/edquota/pathnames.h

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

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


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