merge with 1.10h

diff --git a/lib/getdate.y b/lib/getdate.y
index 3159c6d9a0d73547dc5d557f2001092b746aedb9..7597015609828545913c72c28bb2c37734e48e67 100644 (file)
--- 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 a104fa3135e451c4c2e4e8bd9842e43042bfa833..990c31eb7526375bd512d769d0ad96b979d4f19c 100644 (file)
--- 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'.