* ChangeLog.gcj: Imported 1.1.4, while preserving local changes.

[pf3gnuchains/gcc-fork.git] / zlib / zconf.h

diff --git a/zlib/zconf.h b/zlib/zconf.h
index f641125..6761a05 100644 (file)
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -1,9 +1,9 @@
 /* zconf.h -- configuration of the zlib compression library
- * 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 
  */
 
-/* @(#) $Id: zconf.h,v 1.1 1999/05/04 19:30:27 tromey Exp $ */
+/* @(#) $Id: zconf.h,v 1.1.1.2 2002/03/11 21:53:27 tromey Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H