summaryrefslogtreecommitdiff
path: root/zlib/zutil.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-03-17 01:23:32 +0000
committerjbj <devnull@localhost>2002-03-17 01:23:32 +0000
commit3212547cb597483f131e7f53204d87fe3a9f72f9 (patch)
tree06757be3df849426541a967d66d186d66f3bc17e /zlib/zutil.c
parent3b6077c0bd89b73b163c9bd29516536577e121c5 (diff)
downloadlibrpm-tizen-3212547cb597483f131e7f53204d87fe3a9f72f9.tar.gz
librpm-tizen-3212547cb597483f131e7f53204d87fe3a9f72f9.tar.bz2
librpm-tizen-3212547cb597483f131e7f53204d87fe3a9f72f9.zip
Conflicts.
CVS patchset: 5360 CVS date: 2002/03/17 01:23:32
Diffstat (limited to 'zlib/zutil.c')
-rw-r--r--zlib/zutil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/zlib/zutil.c b/zlib/zutil.c
index 1b09a1544..7a3022138 100644
--- a/zlib/zutil.c
+++ b/zlib/zutil.c
@@ -1,6 +1,6 @@
-/* @(#) $Id: zutil.c,v 1.3 2001/12/27 21:00:18 jbj Exp $ */
+/* @(#) $Id: zutil.c,v 1.4 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
*/