summaryrefslogtreecommitdiffstats
path: root/usr.bin/gzip/gzip.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2008-07-23 00:03:36 +0000
committerdelphij <delphij@FreeBSD.org>2008-07-23 00:03:36 +0000
commit56a762a7267a7885aae1c0636c8a9adc55940111 (patch)
tree2649f39973ae841c53c4152babab1a397d6654bd /usr.bin/gzip/gzip.c
parent1e4302f67a0633f03c9696f8aa7766fd9e23c79e (diff)
downloadFreeBSD-src-56a762a7267a7885aae1c0636c8a9adc55940111.zip
FreeBSD-src-56a762a7267a7885aae1c0636c8a9adc55940111.tar.gz
Sync with NetBSD's license changes.
Diffstat (limited to 'usr.bin/gzip/gzip.c')
-rw-r--r--usr.bin/gzip/gzip.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 603cdc6..67b40ce 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.89 2006/11/13 21:57:59 mrg Exp $ */
+/* $NetBSD: gzip.c,v 1.92 2008/07/21 14:19:22 lukem Exp $ */
/*-
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -12,8 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,8 +29,8 @@
#include <sys/cdefs.h>
#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green\n\
- All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
+ Matthew R. Green. All rights reserved.");
__RCSID("$FreeBSD$");
#endif /* not lint */
@@ -160,8 +158,6 @@ static const char gzip_copyright[] = \
" 2. Redistributions in binary form must reproduce the above copyright\n"
" notice, this list of conditions and the following disclaimer in the\n"
" documentation and/or other materials provided with the distribution.\n"
-" 3. The name of the author may not be used to endorse or promote products\n"
-" derived from this software without specific prior written permission.\n"
"\n"
" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n"
" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n"
OpenPOWER on IntegriCloud