Commit Graph

10 Commits

Author SHA1 Message Date
des
ec17f77885 Resolve conflicts. 2006-03-23 14:09:21 +00:00
kientzle
2f1311730e 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
tjr
2368747166 Resolve conflicts. 2004-06-30 23:54:46 +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
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
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