cvs commit: src/lib/libz - Imported sources

[Tim J. Robbins]

tjr         2004-06-30 23:43:39 UTC

  FreeBSD src repository

  src/lib/libz - Imported sources
  Update of /home/ncvs/src/lib/libz
  In directory repoman.freebsd.org:/tmp/cvs-serv56562
  
  Log Message:
  Import zlib 1.2.1 (trimmed)
  
  Status:
  
  Vendor Tag:	ZLIB
  Release Tags:	v1_2_1
  		
  C src/lib/libz/adler32.c
  U src/lib/libz/algorithm.txt
  U src/lib/libz/ChangeLog
  C src/lib/libz/compress.c
  C src/lib/libz/crc32.c
  N src/lib/libz/crc32.h
  C src/lib/libz/deflate.c
  C src/lib/libz/deflate.h
  C src/lib/libz/example.c
  U src/lib/libz/FAQ
  C src/lib/libz/gzio.c
  C src/lib/libz/INDEX
  N src/lib/libz/infback.c
  C src/lib/libz/inffast.c
  U src/lib/libz/inffast.h
  U src/lib/libz/inffixed.h
  C src/lib/libz/inflate.c
  N src/lib/libz/inflate.h
  C src/lib/libz/inftrees.c
  U src/lib/libz/inftrees.h
  C src/lib/libz/minigzip.c
  U src/lib/libz/README
  C src/lib/libz/trees.c
  U src/lib/libz/trees.h
  C src/lib/libz/uncompr.c
  C src/lib/libz/zconf.h
  C src/lib/libz/zlib.3
  U src/lib/libz/zlib.h
  C src/lib/libz/zutil.c
  C src/lib/libz/zutil.h
  
  18 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jZLIB:yesterday -jZLIB src/lib/libz