source-changes: sun-lamp CVS commits

Subject: sun-lamp CVS commits
To: None <source-changes@pain.lcs.mit.edu>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 07/03/1995 17:10:08

jtc
Mon Jul  3 17:06:13 EDT 1995
Update of /a/cvsroot/src/share/zoneinfo/datfiles
In directory pain.lcs.mit.edu:/a/users/jtc/tzdata

Revision/Branch: 1.1.1

Log Message:
updated to tzdata95d

Status:

Vendor Tag:	ADO
Release Tags:	TZDATA95D
		
U 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
U src/share/zoneinfo/datfiles/northamerica
C 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

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

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