jtc
Mon Jan  8 17:34:58 EST 1996
Update of /a/cvsroot/src/share/zoneinfo/datfiles
In directory pain.lcs.mit.edu:/a/users/jtc/tzdata96a

Revision/Branch: 1.1.1

Log Message:
import tzdata96a

Status:

Vendor Tag:	ADO
Release Tags:	TZDATA96A
		
C src/share/zoneinfo/datfiles/africa
C src/share/zoneinfo/datfiles/antarctica
C src/share/zoneinfo/datfiles/asia
C src/share/zoneinfo/datfiles/australasia
C src/share/zoneinfo/datfiles/europe
C src/share/zoneinfo/datfiles/northamerica
C src/share/zoneinfo/datfiles/southamerica
C 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
C src/share/zoneinfo/datfiles/solar87
C src/share/zoneinfo/datfiles/solar88
C src/share/zoneinfo/datfiles/solar89
U src/share/zoneinfo/datfiles/leapseconds
U src/share/zoneinfo/datfiles/yearistype.sh

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

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


jtc
Mon Jan  8 17:37:14 EST 1996
Update of /a/cvsroot/src/share/zoneinfo/datfiles
In directory pain.lcs.mit.edu:/a/users/jtc/datfiles

Modified Files:
	africa antarctica asia australasia europe northamerica 
	pacificnew solar87 solar88 solar89 southamerica 
Log Message:
sync with tzdata96a