aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lispref/ChangeLog3
1 files changed, 1 insertions, 2 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7b32595083f..0b7903a8159 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -19,7 +19,6 @@
19 (Basic Char Syntax, General Escape Syntax) 19 (Basic Char Syntax, General Escape Syntax)
20 (Ctl-Char Syntax, Meta-Char Syntax): New subnodes. 20 (Ctl-Char Syntax, Meta-Char Syntax): New subnodes.
21 21
22>>>>>>> 1.751
232006-09-11 Richard Stallman <rms@gnu.org> 222006-09-11 Richard Stallman <rms@gnu.org>
24 23
25 * display.texi (Display Table Format): Wording clarification. 24 * display.texi (Display Table Format): Wording clarification.
@@ -4881,7 +4880,7 @@
4881 (info): Add target. 4880 (info): Add target.
4882 (installall): Target removed. 4881 (installall): Target removed.
4883 4882
48842001-10-31 Pavel Jan,Am(Bk <Pavel@Janik.cz> 48832001-10-31 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
4885 4884
4886 * tips.texi (Coding Conventions): Fix typo. 4885 * tips.texi (Coding Conventions): Fix typo.
4887 4886