summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Vladimir N. Oleynik"2005-12-15 12:01:49 +0000
committer"Vladimir N. Oleynik"2005-12-15 12:01:49 +0000
commitddc280ec437d61a6d0a906e414e475e05e877606 (patch)
tree2c414d156434fe0f4fe4a9f488cceb59eaaac76c
parent8315cd527f00b59145d205bc11c0dc9f51f58fd2 (diff)
downloadbusybox-ddc280ec437d61a6d0a906e414e475e05e877606.zip
busybox-ddc280ec437d61a6d0a906e414e475e05e877606.tar.gz
sync license from mainstream
-rw-r--r--shell/ash.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 171d5ed..4fc3e0e 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5,7 +5,7 @@
* Copyright (c) 1989, 1991, 1993, 1994
* 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.
*
*
@@ -13702,11 +13702,7 @@ int main(int argc, char **argv)
* 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. <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
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*