From owner-cvs-all Thu Jan 21 13:35:09 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id NAA01054 for cvs-all-outgoing; Thu, 21 Jan 1999 13:35:09 -0800 (PST) (envelope-from owner-cvs-all@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA01048; Thu, 21 Jan 1999 13:35:07 -0800 (PST) (envelope-from wollman@FreeBSD.org) From: Garrett Wollman Received: (from wollman@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id NAA27224; Thu, 21 Jan 1999 13:35:08 -0800 (PST) Date: Thu, 21 Jan 1999 13:35:08 -0800 (PST) Message-Id: <199901212135.NAA27224@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: cvs commit: src/share/zoneinfo - Imported sources Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk wollman 1999/01/21 13:35:08 PST src/share/zoneinfo - Imported sources Update of /home/ncvs/src/share/zoneinfo In directory freefall.freebsd.org:/d/users/wollman/tzdata Log Message: Try this import again, this time on the correct (sic) vendor branch. Status: Vendor Tag: ADO Release Tags: tzdata1999a C 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 C src/share/zoneinfo/pacificnew U src/share/zoneinfo/etcetera C 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 C src/share/zoneinfo/iso3166.tab C src/share/zoneinfo/zone.tab C src/share/zoneinfo/leapseconds U src/share/zoneinfo/yearistype.sh 11 conflicts created by this import. Use the following command to help the merge: cvs checkout -jADO:yesterday -jADO src/share/zoneinfo To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message