From owner-cvs-all@FreeBSD.ORG  Thu Dec  2 23:01:26 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 35FA516A4CE; Thu,  2 Dec 2004 23:01:26 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 140F043D46; Thu,  2 Dec 2004 23:01:26 +0000 (GMT)
	(envelope-from wollman@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2N1PQw013217;
	Thu, 2 Dec 2004 23:01:25 GMT
	(envelope-from wollman@repoman.freebsd.org)
Received: (from wollman@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2N1PWh013216;
	Thu, 2 Dec 2004 23:01:25 GMT
	(envelope-from wollman)
Message-Id: <200412022301.iB2N1PWh013216@repoman.freebsd.org>
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Thu, 2 Dec 2004 23:01:25 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/share/zoneinfo europe northamerica southamerica
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Dec 2004 23:01:26 -0000

wollman     2004-12-02 23:01:25 UTC

  FreeBSD src repository

  Modified files:
    share/zoneinfo       europe northamerica southamerica 
  Log:
  Fix import conflicts from tzdata2004g.
  
  Obtained from:  ftp://elsie.nci.nih.gov/pub/tzdata2004g.tar.gz
  
  Revision  Changes    Path
  1.29      +8 -3      src/share/zoneinfo/europe
  1.25      +12 -2     src/share/zoneinfo/northamerica
  1.24      +2 -2      src/share/zoneinfo/southamerica