8 Commits

Author	SHA1	Message	Date
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	7f3dea244c	$Id$ -> $FreeBSD$	1999-08-28 00:22:10 +00:00
Peter Wemm	41d54c8049	Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline.	1999-01-10 09:53:51 +00:00
Steve Price	25552e1d6d	Merge conflicts.	1998-02-28 06:08:17 +00:00
Jordan K. Hubbard	1130b656e5	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 Wemm	ac0a48f6a5	Initial import of zlib-1.0.4	1996-08-18 17:54:27 +00:00