jtc
Thu Sep 28 03:33:37 EDT 1995
Update of /a/cvsroot/src/share/zoneinfo/datfiles
In directory pain.lcs.mit.edu:/a/users/jtc/datfiles

Revision/Branch: 1.1.1

Log Message:
updated to tzdata95i

Status:

Vendor Tag:	ADO
Release Tags:	TZDATA95I
		
C src/share/zoneinfo/datfiles/africa
U src/share/zoneinfo/datfiles/antarctica
C src/share/zoneinfo/datfiles/asia
U src/share/zoneinfo/datfiles/australasia
C src/share/zoneinfo/datfiles/europe
C src/share/zoneinfo/datfiles/northamerica
U src/share/zoneinfo/datfiles/southamerica
U src/share/zoneinfo/datfiles/pacificnew
U src/share/zoneinfo/datfiles/etcetera
U src/share/zoneinfo/datfiles/factory
U src/share/zoneinfo/datfiles/backward
U src/share/zoneinfo/datfiles/systemv
U src/share/zoneinfo/datfiles/solar87
U src/share/zoneinfo/datfiles/solar88
U src/share/zoneinfo/datfiles/solar89
U src/share/zoneinfo/datfiles/leapseconds
U src/share/zoneinfo/datfiles/yearistype.sh

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

	cvs checkout -jADO:yesterday -jADO src/share/zoneinfo/datfiles


perry
Thu Sep 28 03:34:42 EDT 1995
Update of /a/cvsroot/src/usr.bin/env
In directory pain.lcs.mit.edu:/a/users/perry/NetBSD/env

Modified Files:
	Makefile env.c 
Log Message:
Merge and Sync with 4.4BSD-Lite2
Mostly looks like the previous NetBSD version, actually -- only minimal
Lite2 stigmata preserved although I started with Lite2. Mostly the changes
were things like index->strchr and the rest was NetBSD code.


jtc
Thu Sep 28 03:36:00 EDT 1995
Update of /a/cvsroot/src/share/zoneinfo/datfiles
In directory pain.lcs.mit.edu:/a/users/jtc/zone

Modified Files:
	africa asia europe northamerica 
Log Message:
sync with tzdata95i

tls
Thu Sep 28 03:38:22 EDT 1995
Update of /a/cvsroot/src/usr.bin/quota
In directory pain.lcs.mit.edu:/a/users/tls/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
I src/usr.bin/quota/tags
C src/usr.bin/quota/quota.c
U src/usr.bin/quota/quota.1
I src/usr.bin/quota/obj
U src/usr.bin/quota/Makefile

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

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