Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve conflicts. | des | 2006-03-23 | 1 | -3/+1 |
| | |||||
* | Since the FreeBSD local modifications are mostly trivial (consisting | kientzle | 2005-05-11 | 1 | -2/+1 |
| | | | | | | | | | | | | | 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. | tjr | 2004-06-30 | 1 | -63/+74 |
| | |||||
* | Fix conflicts. | green | 2002-03-11 | 1 | -1/+1 |
| | |||||
* | Add huff __FBSDID()s puff to whew! libz | dillon | 2001-09-30 | 1 | -1/+2 |
| | |||||
* | $Id$ -> $FreeBSD$ | peter | 1999-08-28 | 1 | -1/+1 |
| | |||||
* | Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline. | peter | 1999-01-10 | 1 | -12/+18 |
| | |||||
* | Merge conflicts. | steve | 1998-02-28 | 1 | -24/+71 |
| | |||||
* | Make the long-awaited change from $Id$ to $FreeBSD$ | jkh | 1997-01-14 | 1 | -1/+1 |
| | | | | | | | | 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 | peter | 1996-08-18 | 1 | -0/+503 |