From owner-cvs-src@FreeBSD.ORG  Sun Oct 17 23:57:38 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2C31516A4CE; Sun, 17 Oct 2004 23:57:38 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 21B4A43D1D; Sun, 17 Oct 2004 23:57:38 +0000 (GMT)
	(envelope-from wollman@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9HNvcSO030502;
	Sun, 17 Oct 2004 23:57:38 GMT
	(envelope-from wollman@repoman.freebsd.org)
Received: (from wollman@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9HNvcKA030501;
	Sun, 17 Oct 2004 23:57:38 GMT
	(envelope-from wollman)
Message-Id: <200410172357.i9HNvcKA030501@repoman.freebsd.org>
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Sun, 17 Oct 2004 23:57:38 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: ADO
Subject: cvs commit: src/share/zoneinfo - Imported sources
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Oct 2004 23:57:38 -0000

wollman     2004-10-17 23:57:37 UTC

  FreeBSD src repository

  src/share/zoneinfo - Imported sources
  Update of /home/ncvs/src/share/zoneinfo
  In directory repoman.freebsd.org:/tmp/cvs-serv30446
  
  Log Message:
  Redo vendor import using correct (nonstandard) vendor branch.
  
  Status:
  
  Vendor Tag:	ADO
  Release Tags:	tzdata2004e
  		
  U src/share/zoneinfo/africa
  U src/share/zoneinfo/antarctica
  C src/share/zoneinfo/asia
  U 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
  C src/share/zoneinfo/iso3166.tab
  C src/share/zoneinfo/zone.tab
  C src/share/zoneinfo/leapseconds
  U src/share/zoneinfo/yearistype.sh
  
  7 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jADO:yesterday -jADO src/share/zoneinfo