Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 05/13/1996 17:30:05
jtc
Mon May 13 17:28:36 EDT 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 tzdata96h
Status:
Vendor Tag: ADO
Release Tags: TZDATA96H
C src/share/zoneinfo/datfiles/africa
U 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
U src/share/zoneinfo/datfiles/leapseconds
U src/share/zoneinfo/datfiles/yearistype.sh
6 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jADO:yesterday -jADO src/share/zoneinfo/datfiles