diff options
| author | jbj <devnull@localhost> | 2002-03-17 01:23:32 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-03-17 01:23:32 +0000 |
| commit | 3212547cb597483f131e7f53204d87fe3a9f72f9 (patch) | |
| tree | 06757be3df849426541a967d66d186d66f3bc17e /zlib/deflate.h | |
| parent | 3b6077c0bd89b73b163c9bd29516536577e121c5 (diff) | |
| download | rpm-3212547cb597483f131e7f53204d87fe3a9f72f9.tar.gz | |
Conflicts.
CVS patchset: 5360
CVS date: 2002/03/17 01:23:32
Diffstat (limited to 'zlib/deflate.h')
| -rw-r--r-- | zlib/deflate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zlib/deflate.h b/zlib/deflate.h index 1dcd62f0d..c86bf6ea1 100644 --- a/zlib/deflate.h +++ b/zlib/deflate.h @@ -1,6 +1,6 @@ -/* @(#) $Id: deflate.h,v 1.4 2001/12/27 21:00:17 jbj Exp $ */ +/* @(#) $Id: deflate.h,v 1.5 2002/02/10 16:50:06 jbj Exp $ */ /* - * Copyright (C) 1995-1998 Jean-loup Gailly + * Copyright (C) 1995-2002 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ |