Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22270, verified by myself.

diff --git a/include/tzfile.h b/include/tzfile.h
index e10f0bf82d291f6be0827850abfc921d67d8b30d..0029eae2ab0c70cf496f3d1ee037420221e9162a 100644 (file)
--- a/include/tzfile.h
+++ b/include/tzfile.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: tzfile.h,v 1.6 1998/07/30 14:11:22 kleink Exp $        */
+/*     $NetBSD: tzfile.h,v 1.7 2003/08/07 09:44:11 agc Exp $   */
 
 /*
  * Copyright (c) 1988, 1993
@@ -15,11 +15,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.
  *