From: Martin Pool <mbp@samba.org>
Date: Tue, 12 Mar 2002 02:07:36 +0000 (+0000)
Subject: Additional trivial merge patch from Jos
X-Git-Tag: v2.5.4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac69049ec2c354299b260fb859d029609fba91e5;p=thirdparty%2Frsync.git

Additional trivial merge patch from Jos
---

diff --git a/zlib/infblock.c b/zlib/infblock.c
index 55e0eec0..96a7a265 100644
--- a/zlib/infblock.c
+++ b/zlib/infblock.c
@@ -1,5 +1,5 @@
 /* infblock.c -- interpret and process block types to last block
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */