From de8c62d0f0316034b37e788eb1b25f08c151709e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 1 Sep 1994 23:20:29 +0000 Subject: [PATCH] merge with 1.10h --- lib/getdate.y | 4 +++- old/sh-utils/ChangeLog | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/getdate.y b/lib/getdate.y index 3159c6d..7597015 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -484,8 +484,10 @@ static TABLE const TimezoneTable[] = { { "idlw", tZONE, HOUR(12) }, /* International Date Line West */ { "cet", tZONE, -HOUR(1) }, /* Central European */ { "met", tZONE, -HOUR(1) }, /* Middle European */ + { "metdst", tDAYZONE, -HOUR(1) }, /* Middle European Daylight */ { "mewt", tZONE, -HOUR(1) }, /* Middle European Winter */ { "mest", tDAYZONE, -HOUR(1) }, /* Middle European Summer */ + { "mesz", tDAYZONE, -HOUR(1) }, /* Middle European Summer */ { "swt", tZONE, -HOUR(1) }, /* Swedish Winter */ { "sst", tDAYZONE, -HOUR(1) }, /* Swedish Summer */ { "fwt", tZONE, -HOUR(1) }, /* French Winter */ @@ -502,7 +504,7 @@ static TABLE const TimezoneTable[] = { #endif { "zp6", tZONE, -HOUR(6) }, /* USSR Zone 5 */ #if 0 - /* For completeness. NST is also Newfoundland Stanard, and SST is + /* For completeness. NST is also Newfoundland Standard, and SST is * also Swedish Summer. */ { "nst", tZONE, -HOUR(6.5) },/* North Sumatra */ { "sst", tZONE, -HOUR(7) }, /* South Sumatra, USSR Zone 6 */ diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog index a104fa3..990c31e 100644 --- a/old/sh-utils/ChangeLog +++ b/old/sh-utils/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 27 16:57:20 1994 Jim Meyering (meyering@comco.com) + + * system.h [BROKEN_STAT_MACROS]: Remove unnecessary #ifdef's. + From Francois Pinard. + Thu Aug 18 11:44:48 1994 Jim Meyering (meyering@comco.com) * su.1: Explain why GNU doesn't support the `wheel group'. -- 2.7.4