*** empty log message ***

1 files changed, 14 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 3b6507e6b78..1a10e14923a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-27  Richard M. Stallman  <rms@gnu.org>
+
+        * Makefile.in (MAKEINFO): Specify --force.
+
+        * basic.texi (Moving Point): C-e now runs move-end-of-line.
+        (Undo): Doc undo-outer-limit.
+
+2004-12-11  Richard M. Stallman  <rms@gnu.org>
+
+        * Makefile.in (MAKEINFO): Add --force.
+
 2004-12-20  Jay Belanger  <belanger@truman.edu>
 
         * calc.texi (Types Tutorial): Emphasized that you can't divide by
@@ -23,6 +34,7 @@
         the standard "The GNU Emacs Manual" in fifth argument of @xref's.
         (Dealing with HTTP documents): @inforef->@xref.
 
+>>>>>>> 1.412
 2004-12-15  Juri Linkov  <juri@jurta.org>
 
         * mark.texi (Transient Mark, Mark Ring): M-< and other
@@ -39,6 +51,7 @@
 
         * calc.texi: Fix some TeX definitions.
 
+>>>>>>> 1.407
 2004-12-12  Juri Linkov  <juri@jurta.org>
 
         * misc.texi (FFAP): Add C-x C-r, C-x C-v, C-x C-d,
@@ -52,6 +65,7 @@
         * mark.texi (Marking Objects): Marking commands also extend the
         region when mark is active in Transient Mark mode.
 
+>>>>>>> 1.403
 2004-12-09  Luc Teirlinck  <teirllm@auburn.edu>
 
         * reftex.texi (Imprint): Remove erroneous @value's.