*** empty log message ***

1 files changed, 6 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 10dcd3d81ed..795eb815f06 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,14 @@
+2000-02-12  Gerd Moellmann  <gerd@gnu.org>
+
+        * xdisp.c (syms_of_xdisp): Doc fix for scroll-conservatively.
+
 2000-02-12  Dave Love  <fx@gnu.org>
 
         * s/aix3-2.h, s/osf-1.h: Define C_DEBUG_SWITCH for non-gcc.
 
         * s/ux4800.h, s/umips.h, s/umax.h, s/sol2.h, s/sco5.h, s/rtu.h:
-        * s/ptx4.h, s/umax.h, s/dgux.h, s/bsd4-2.h s/bsd4-3.h:
-        * s/hpux.h
-        Don't define HAVE_VFORK.
+        * s/ptx4.h, s/umax.h, s/dgux.h, s/bsd4-2.h, s/bsd4-3.h:
+        * s/hpux.h: Don't define HAVE_VFORK.
 
         * s/gnu-linux.h: Don't define HAVE_VFORK or HAVE_SYS_SIGLIST.