Commit Graph

21 Commits

Author SHA1 Message Date
imp
790883ece1 Revert 212517 to restore pristine state of this file 2010-10-13 16:34:08 +00:00
imp
c79019f766 Include FreeBSD svn tag 2010-09-13 01:44:07 +00:00
delphij
60d1ae7ed9 MFV: libz 1.2.4.3. 2010-04-16 20:04:45 +00:00
delphij
ba79e1ef62 Update to 1.2.4.1 (beta). 2010-03-31 20:55:13 +00:00
delphij
242fa9b755 Update to zlib 1.2.4 and add versioned symbols to the
library.

Sponsored by:	iXsystems, Inc.
2010-03-22 21:11:55 +00:00
delphij
f1216d1f0a Create a custom branch where I will be able to do the merge. 2010-03-19 00:19:55 +00:00
des
ec17f77885 Resolve conflicts. 2006-03-23 14:09:21 +00:00
tjr
2368747166 Resolve conflicts. 2004-06-30 23:54:46 +00:00
johan
b8f13ad643 Actually implement gzip's -c option. minigzip now also doubles
as zcat properly.

PR:		13043
Submitted by:	Toshihiko ARAI <toshi@jp.freebsd.org>
		Jonathan Towne <jontow@twcny.rr.com>

Approved by:	peter, sheldonh (mentor)
MFC After:	2 weeks
2002-10-03 19:30:22 +00:00
markm
eb7b85d384 Fix an easy warning in a local addition. 2002-08-01 11:29:05 +00:00
green
afc9128405 s/nilename/filename/ 2002-03-11 22:36:45 +00:00
green
7ca574f59c Fix conflicts. 2002-03-11 22:36:26 +00:00
dillon
198df63868 Add huff __FBSDID()s puff to whew! libz 2001-09-30 22:39:00 +00:00
asmodai
7d76aced28 Fix typo: compatability -> compatibility.
Compatability is not an existing english word.
2001-02-06 12:05:58 +00:00
kris
0b697dfdc6 Prevent buffer overflows. 2000-08-04 06:25:30 +00:00
peter
76f0c923fe $Id$ -> $FreeBSD$ 1999-08-28 00:22:10 +00:00
peter
67d696bb62 Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline. 1999-01-10 09:53:51 +00:00
jkh
22e2b9966d Allow minigzip to be invoked more like gzip, checking to see
if we're being called as gunzip as well as dealing with the -c
flag.
Submitted by:	jhay
1998-09-29 04:56:30 +00:00
steve
237ff31c6d Merge conflicts. 1998-02-28 06:08:17 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
peter
70c83c0586 Initial import of zlib-1.0.4 1996-08-18 17:54:27 +00:00