aboutsummaryrefslogtreecommitdiffstats
path: root/zlib
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2002-03-12 02:07:36 +0000
committerMartin Pool <mbp@samba.org>2002-03-12 02:07:36 +0000
commitac69049ec2c354299b260fb859d029609fba91e5 (patch)
tree32f6764b8f688e91572a67921cb58adc700f5eea /zlib
parentb2a2dd115446f905458368f9e4d20df457fd7a87 (diff)
downloadandroid_external_rsync-ac69049ec2c354299b260fb859d029609fba91e5.tar.gz
android_external_rsync-ac69049ec2c354299b260fb859d029609fba91e5.tar.bz2
android_external_rsync-ac69049ec2c354299b260fb859d029609fba91e5.zip
Additional trivial merge patch from Jos
Diffstat (limited to 'zlib')
-rw-r--r--zlib/infblock.c2
1 files changed, 1 insertions, 1 deletions
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
*/