src/lib/libz/example.c, branch release/8.2.0_cvs FreeBSD source tree Resolve conflicts. 2006-03-23T14:09:21+00:00 Dag-Erling Smørgrav des@FreeBSD.org 2006-03-23T14:09:21+00:00 ed440ef6e41316d133fb0e6c6b2500e7a4f34479 






Since the FreeBSD local modifications are mostly trivial (consisting
2005-05-11T03:47:48+00:00

Tim Kientzle
kientzle@FreeBSD.org

2005-05-11T03:47:48+00:00

42307a8f43e28c8a286aad36f21d647342ad9933

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





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







Resolve conflicts.
2004-06-30T23:54:46+00:00

Tim J. Robbins
tjr@FreeBSD.org

2004-06-30T23:54:46+00:00

0b73a4c3010d9d6ae8d78f9fb1ae42fa5789dcad












Fix conflicts.
2002-03-11T22:36:26+00:00

Brian Feldman
green@FreeBSD.org

2002-03-11T22:36:26+00:00

4d22b11a56999255d263ddecadfbe73b9a80030d












Add huff __FBSDID()s puff to whew! libz
2001-09-30T22:39:00+00:00

Matthew Dillon
dillon@FreeBSD.org

2001-09-30T22:39:00+00:00

fa81a9761dd7e03557d20c88d3e5343db0db096e












$Id$ -> $FreeBSD$
1999-08-28T00:22:10+00:00

Peter Wemm
peter@FreeBSD.org

1999-08-28T00:22:10+00:00

7f3dea244c40159a41ab22da77a434d7c5b5e85a












Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline.
1999-01-10T09:53:51+00:00

Peter Wemm
peter@FreeBSD.org

1999-01-10T09:53:51+00:00

41d54c8049107c372198b9a6ed24ef5fad20afdc












Merge conflicts.
1998-02-28T06:08:17+00:00

Steve Price
steve@FreeBSD.org

1998-02-28T06:08:17+00:00

25552e1d6dce6efe03da01eeef4eee84ca0a2418












Make the long-awaited change from $Id$ to $FreeBSD$
1997-01-14T07:20:47+00:00

Jordan K. Hubbard
jkh@FreeBSD.org

1997-01-14T07:20:47+00:00

1130b656e5fe4c2d1ba299e024d1b40eaeebd380

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.





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.







Initial import of zlib-1.0.4
1996-08-18T17:54:27+00:00

Peter Wemm
peter@FreeBSD.org

1996-08-18T17:54:27+00:00

ac0a48f6a5648ea9c688729078a16c5ce5b45d34