NetBSD master CVS tree commits

[The Source of All Evil <source>]

jtc
Tue Mar 19 13:49:32 EST 1996
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:
import tzdata96d

Status:

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