diff options
| author | delphij <delphij@FreeBSD.org> | 2008-07-23 00:03:36 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2008-07-23 00:03:36 +0000 |
| commit | 56a762a7267a7885aae1c0636c8a9adc55940111 (patch) | |
| tree | 2649f39973ae841c53c4152babab1a397d6654bd /usr.bin/gzip | |
| parent | 1e4302f67a0633f03c9696f8aa7766fd9e23c79e (diff) | |
| download | FreeBSD-src-56a762a7267a7885aae1c0636c8a9adc55940111.zip FreeBSD-src-56a762a7267a7885aae1c0636c8a9adc55940111.tar.gz | |
Sync with NetBSD's license changes.
Diffstat (limited to 'usr.bin/gzip')
| -rw-r--r-- | usr.bin/gzip/gzip.1 | 4 | ||||
| -rw-r--r-- | usr.bin/gzip/gzip.c | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr.bin/gzip/gzip.1 b/usr.bin/gzip/gzip.1 index 73e63e0..e6c61a7 100644 --- a/usr.bin/gzip/gzip.1 +++ b/usr.bin/gzip/gzip.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: gzip.1,v 1.18 2005/09/30 13:46:56 wiz Exp $ +.\" $NetBSD: gzip.1,v 1.19 2008/05/29 14:51:27 mrg Exp $ .\" .\" Copyright (c) 1997, 2003, 2004 Matthew R. Green .\" All rights reserved. @@ -11,8 +11,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 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" |
