Commit 3c86abc0 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix commit conflicts.

parent 64819146
......@@ -117,10 +117,6 @@
* 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): Emphasize that you can't divide by
......@@ -146,7 +142,6 @@
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
......@@ -163,7 +158,6 @@
* 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,
......@@ -177,7 +171,6 @@
* 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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment