diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-01-13 03:16:07 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-01-13 03:16:07 +0000 |
| commit | ccdd63731138d226e76175c6d2cd7aa678ecfeec (patch) | |
| tree | 2ce3620606cf1cc2ffcc31869bfd88ac32f32465 /epan/inet_aton.c | |
| parent | 19bd3956a2a8964dc95216a7aa69430efa552531 (diff) | |
Remove "advertising clause" from BSD license per:
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
July 22, 1999
To All Licensees, Distributors of Any Version of BSD:
As you know, certain of the Berkeley Software Distribution ("BSD") source
code files require that further distributions of products containing all or
portions of the software, acknowledge within their advertising materials
that such products contain software developed by UC Berkeley and its
contributors.
Specifically, the provision reads:
" * 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors."
Effective immediately, licensees and distributors are no longer required to
include the acknowledgement within advertising materials. Accordingly, the
foregoing paragraph of those BSD Unix files containing it is hereby deleted
in its entirety.
William Hoskins
Director, Office of Technology Licensing
University of California, Berkeley
svn path=/trunk/; revision=20412
Diffstat (limited to 'epan/inet_aton.c')
| -rw-r--r-- | epan/inet_aton.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/inet_aton.c b/epan/inet_aton.c index 880d669117..331095fd30 100644 --- a/epan/inet_aton.c +++ b/epan/inet_aton.c @@ -10,11 +10,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 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. * |