From owner-cvs-share Thu Jan 2 09:17:52 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id JAA15708 for cvs-share-outgoing; Thu, 2 Jan 1997 09:17:52 -0800 (PST) Received: (from wollman@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id JAA15701; Thu, 2 Jan 1997 09:17:49 -0800 (PST) Date: Thu, 2 Jan 1997 09:17:49 -0800 (PST) From: Garrett Wollman Message-Id: <199701021717.JAA15701@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-share Subject: cvs commit: src/share/zoneinfo - Imported sources Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk wollman 97/01/02 09:17:48 src/share/zoneinfo - Imported sources Update of /home/ncvs/src/share/zoneinfo In directory freefall.freebsd.org:/a/wollman/new-tzdata Revision/Branch: 1.1.2 Log Message: Latest timezone data file update. Changes are principally editorial in nature; no new zones. Obtained from: Arthur David Olson, ado@elsie.nci.nih.gov Status: Vendor Tag: ADO Release Tags: tzdata1996n U src/share/zoneinfo/africa U src/share/zoneinfo/antarctica C src/share/zoneinfo/asia C src/share/zoneinfo/australasia C src/share/zoneinfo/europe C src/share/zoneinfo/northamerica C src/share/zoneinfo/southamerica U src/share/zoneinfo/pacificnew U src/share/zoneinfo/etcetera U src/share/zoneinfo/factory U src/share/zoneinfo/backward U src/share/zoneinfo/systemv U src/share/zoneinfo/solar87 U src/share/zoneinfo/solar88 U src/share/zoneinfo/solar89 U src/share/zoneinfo/iso3166.tab U src/share/zoneinfo/zone.tab U src/share/zoneinfo/leapseconds U src/share/zoneinfo/yearistype.sh 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jADO:yesterday -jADO src/share/zoneinfo