merge lite-2

diff --git a/include/tzfile.h b/include/tzfile.h
index b5cf986ed7fa29b7c022f31a2d582f4250b157c9..498f36463270b8346ab334e63ad61ff78160dcb7 100644 (file)
--- a/include/tzfile.h
+++ b/include/tzfile.h
@@ -1,8 +1,8 @@
-/*     $NetBSD: tzfile.h,v 1.4 1997/07/25 05:54:42 mikel Exp $ */
+/*     $NetBSD: tzfile.h,v 1.5 1998/02/02 21:08:11 perry Exp $ */
 
 /*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Arthur David Olson of the National Cancer Institute.
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     @(#)tzfile.h    5.10 (Berkeley) 4/3/91
+ *     @(#)tzfile.h    8.1 (Berkeley) 6/2/93
  */
 
 #ifndef _TZFILE_H_