diff options
author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-12-15 12:01:49 +0000 |
---|---|---|
committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-12-15 12:01:49 +0000 |
commit | ddc280ec437d61a6d0a906e414e475e05e877606 (patch) | |
tree | 2c414d156434fe0f4fe4a9f488cceb59eaaac76c | |
parent | 8315cd527f00b59145d205bc11c0dc9f51f58fd2 (diff) | |
download | busybox-w32-ddc280ec437d61a6d0a906e414e475e05e877606.tar.gz busybox-w32-ddc280ec437d61a6d0a906e414e475e05e877606.tar.bz2 busybox-w32-ddc280ec437d61a6d0a906e414e475e05e877606.zip |
sync license from mainstream
-rw-r--r-- | shell/ash.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/shell/ash.c b/shell/ash.c index 171d5ede7..4fc3e0e15 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (c) 1989, 1991, 1993, 1994 | 5 | * Copyright (c) 1989, 1991, 1993, 1994 |
6 | * The Regents of the University of California. All rights reserved. | 6 | * The Regents of the University of California. All rights reserved. |
7 | * | 7 | * |
8 | * Copyright (c) 1997-2003 Herbert Xu <herbert@debian.org> | 8 | * Copyright (c) 1997-2005 Herbert Xu <herbert@gondor.apana.org.au> |
9 | * was re-ported from NetBSD and debianized. | 9 | * was re-ported from NetBSD and debianized. |
10 | * | 10 | * |
11 | * | 11 | * |
@@ -13702,11 +13702,7 @@ int main(int argc, char **argv) | |||
13702 | * 2. Redistributions in binary form must reproduce the above copyright | 13702 | * 2. Redistributions in binary form must reproduce the above copyright |
13703 | * notice, this list of conditions and the following disclaimer in the | 13703 | * notice, this list of conditions and the following disclaimer in the |
13704 | * documentation and/or other materials provided with the distribution. | 13704 | * documentation and/or other materials provided with the distribution. |
13705 | * | 13705 | * 3. Neither the name of the University nor the names of its contributors |
13706 | * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change | ||
13707 | * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> | ||
13708 | * | ||
13709 | * 4. Neither the name of the University nor the names of its contributors | ||
13710 | * may be used to endorse or promote products derived from this software | 13706 | * may be used to endorse or promote products derived from this software |
13711 | * without specific prior written permission. | 13707 | * without specific prior written permission. |
13712 | * | 13708 | * |