sync license from mainstream

This commit is contained in:
"Vladimir N. Oleynik" 2005-12-15 12:01:49 +00:00
parent 8315cd527f
commit ddc280ec43

View File

@ -5,7 +5,7 @@
* Copyright (c) 1989, 1991, 1993, 1994 * Copyright (c) 1989, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Copyright (c) 1997-2003 Herbert Xu <herbert@debian.org> * Copyright (c) 1997-2005 Herbert Xu <herbert@gondor.apana.org.au>
* was re-ported from NetBSD and debianized. * was re-ported from NetBSD and debianized.
* *
* *
@ -13702,11 +13702,7 @@ int main(int argc, char **argv)
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * 3. Neither the name of the University nor the names of its contributors
* 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
* ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
*
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *