[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108170: ChangeLog merge fix

[Glenn Morris]

------------------------------------------------------------
revno: 108170
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-08 20:23:20 -0700
message:
  ChangeLog merge fix
modified:
  doc/lispintro/ChangeLog

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2012-05-09 03:06:08 +0000
+++ b/doc/lispintro/ChangeLog   2012-05-09 03:23:20 +0000
@@ -1,12 +1,3 @@
-2012-05-09  Glenn Morris  <address@hidden>
-
-       * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
-       (Void Function, Wrong Type of Argument, Recursion with list)
-       (Simple Extension): Assume a non-ancient Emacs.
-       (Void Variable, Switching Buffers): Improve page breaks.
-
-       * emacs-lisp-intro.texi: Update GNU Press contact details.
-
 2012-05-05  Glenn Morris  <address@hidden>
 
        * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.