diff options
| author | delphij <delphij@FreeBSD.org> | 2009-06-23 23:27:35 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-06-23 23:27:35 +0000 |
| commit | c3020006f4bc11eda87a5fc1d2876880f5a5740a (patch) | |
| tree | f159a8633860ae72656274eaa769f11421dbd874 /lib | |
| parent | facbf89fc7d7cb6a174c1852a824d72e285ef842 (diff) | |
| download | FreeBSD-src-c3020006f4bc11eda87a5fc1d2876880f5a5740a.zip FreeBSD-src-c3020006f4bc11eda87a5fc1d2876880f5a5740a.tar.gz | |
Merge NetBSD revision 1.14: humanize_number.c is now 2-clause BSD licensed.
(humanize_number.3 intentionally hold back until I make sure why we didn't
merged dehumanize_number(3)).
Obtained from: NetBSD
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libutil/humanize_number.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c index f4c3316..de98587 100644 --- a/lib/libutil/humanize_number.c +++ b/lib/libutil/humanize_number.c @@ -1,4 +1,4 @@ -/* $NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $ */ +/* $NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc. @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
