*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0891cd774f4000ca9454bf621ef5af35f647a1f7..041b558ccadd92a1dfe79853dcfd9eed07bf3815 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 1999-12-02  Gerd Moellmann  <gerd@gnu.org>
 
+       * calendar/appt.el (appt-convert-time): Handle "12:MMam", 
+       remove extraneous string-match.
+
        * finder.el (finder-commentary): Activate Finder mode.
 
 1999-12-01  Anders Lindgren  <andersl@andersl.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index c9a645dd0cf72873583835169fe0cc988ee4f471..5c69bd2e39bda532540abb2069a57d3c788b9289 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,25 @@
+1999-12-02  Gerd Moellmann  <gerd@gnu.org>
+
+       * s/usg5-4.h (LIBS_SYSTEM): Add -lgen because that's needed
+       for building with Motif.
+
+       * m/iris4d.h (UNEXEC) [USG5_4]: Use unexsgi.o instead of
+       unexelf.o.
+       
+       * m/iris5d.h (UNEXEC): Use unexsgi.o instead of unexelf.o.
+
 1999-12-01  Dave Love  <fx@gnu.org>
 
        * emacs.c (main): Set LANG=C iff AX3_2 defined.
 
+1999-11-28  Gerd Moellmann  <gerd@gnu.org>
+
+       * systime.h (EMACS_TIME_CMP, EMACS_TIME_EQ, EMACS_TIME_NE)
+       (EMACS_TIME_GT, EMACS_TIME_GE, EMACS_TIME_LT,EMACS_TIME_LE): New
+       macros.
+
+       * config.in (HAVE_SETITIMER, HAVE_UALARM): New.
+
 1999-11-28  eliz  <eliz@dlpx1>
 
        * emacs.c (synchronize_locale): Avoid compiler warnings about