NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

jtc
Tue Dec 17 21:21:16 PST 1996
Update of /a/cvsroot/src/share/zoneinfo/datfiles
In directory netbsd1:/home/jtc/tzdata

Log Message:
import tzdata96m

Status:

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

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

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


jtc
Tue Dec 17 21:22:56 PST 1996
Update of /a/cvsroot/src/share/zoneinfo/datfiles
In directory netbsd1:/home/jtc/Z

Modified Files:
        africa antarctica asia australasia etcetera europe 
        northamerica pacificnew southamerica 
Log Message:
sync with tzdata96m

jtc
Tue Dec 17 21:24:28 PST 1996
Update of /a/cvsroot/doc
In directory netbsd1:/home/jtc/doc

Modified Files:
        3RDPARTY 
Log Message:
note tzdata upgrade

jtc
Tue Dec 17 21:26:21 PST 1996
Update of /a/cvsroot/doc
In directory netbsd1:/home/jtc/doc

Modified Files:
        3RDPARTY 
Log Message:
Add pdksh