10 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
Stefan Eßer	3a8c99f73f	Fix URL of zlib home page: It's hosted at gzip.org now.	2003-06-26 20:05:47 +00:00
Brian Feldman	4d22b11a56	Fix conflicts.	2002-03-11 22:36:26 +00:00
Dima Dorfman	7ebcc426ef	Remove whitespace at EOL.	2001-07-15 07:53:42 +00:00
Sheldon Hearn	c6ff3a1bf7	Remove single-space hard sentence breaks. These degrade the quality ... of the typeset output, tend to make diffs harder to read and provide bad examples for new-comers to mdoc.	2000-03-02 09:14:21 +00:00
Mike Pritchard	229494cb51	Add $FreeBSD$ lines to man pages that are missing them to make it ... easier for translation teams. PR: docs/13418 Submitted by: Alexey Zelkin <phantom@cris.net>	1999-08-28 23:10:20 +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