svn commit: r215880 - head/contrib/traceroute

[Ulrich Spoerlein]

Author: uqs
Date: Fri Nov 26 20:34:43 2010
New Revision: 215880
URL: http://svn.freebsd.org/changeset/base/215880

Log:
  Remove clause 3 and 4 from TNF licenses.
  
  Obtained from:	NetBSD
  Approved by:	core

Modified:
  head/contrib/traceroute/as.c
  head/contrib/traceroute/as.h

Modified: head/contrib/traceroute/as.c
==============================================================================
--- head/contrib/traceroute/as.c	Fri Nov 26 19:48:27 2010	(r215879)
+++ head/contrib/traceroute/as.c	Fri Nov 26 20:34:43 2010	(r215880)
@@ -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

Modified: head/contrib/traceroute/as.h
==============================================================================
--- head/contrib/traceroute/as.h	Fri Nov 26 19:48:27 2010	(r215879)
+++ head/contrib/traceroute/as.h	Fri Nov 26 20:34:43 2010	(r215880)
@@ -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