8 commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	ed440ef6e4	Resolve conflicts.	2006-03-23 14:09:21 +00:00
Tim Kientzle	42307a8f43	Since the FreeBSD local modifications are mostly trivial (consisting ... primarily of pointless $FreeBSD$ tags), sync most files in HEAD with those in the ZLIB branch. This minimizes the differences between HEAD and ZLIB and should simplify future imports. After this, there are only three files with local modifications (gzio.c, minigzip.c, and zconf.h) and two non-vendor files (Makefile, zopen.c). The rest exactly match the vendor distribution. PR: i386/76294 MFC after: 2 weeks	2005-05-11 03:47:48 +00:00
Tim J. Robbins	0b73a4c301	Resolve conflicts.	2004-06-30 23:54:46 +00:00
Brian Feldman	4d22b11a56	Fix conflicts.	2002-03-11 22:36:26 +00:00
Matthew Dillon	fa81a9761d	Add huff __FBSDID()s puff to whew! libz	2001-09-30 22:39:00 +00:00
Peter Wemm	628b9c3475	Import zlib 1.1.3 onto the vendor branch. ... Obtained from: ftp.cdrom.com:/pub/infozip/zlib	1999-01-10 09:47:00 +00:00
Steve Price	bd957a8d6c	Initial import of zlib-1.1.1 ... PR: 5869 Reviewed by: jdp	1998-02-28 06:04:26 +00:00
Peter Wemm	ac0a48f6a5	Initial import of zlib-1.0.4	1996-08-18 17:54:27 +00:00