NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

jtc
Tue Sep 10 15:52:09 PDT 1996
Update of /cvsroot/src/share/zoneinfo/datfiles
In directory netbsd1:/home/jtc/tzdata96k

Log Message:
import tzdata96k

Status:

Vendor Tag:     ADO
Release Tags:   TZDATA96K
                
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
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
N src/share/zoneinfo/datfiles/iso3166.tab
N src/share/zoneinfo/datfiles/zone.tab
U src/share/zoneinfo/datfiles/leapseconds
U src/share/zoneinfo/datfiles/yearistype.sh

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

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


jtc
Tue Sep 10 15:54:30 PDT 1996
Update of /cvsroot/src/share/zoneinfo/datfiles
In directory netbsd1:/home/jtc/datfiles

Modified Files:
        africa antarctica asia australasia europe northamerica 
        southamerica 
Log Message:
sync with tzdata96k