cvs commit: src/share/zoneinfo - Imported sources

[Garrett Wollman]

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