[Emacs-diffs] /srv/bzr/emacs/trunk r108103: Fix merged ChangeLog entry

[Glenn Morris]

------------------------------------------------------------
revno: 108103
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-02 09:14:20 -0700
message:
  Fix merged ChangeLog entry
modified:
  ChangeLog

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-02 07:45:16 +0000
+++ b/ChangeLog 2012-05-02 16:14:20 +0000
@@ -10,9 +10,6 @@
        * Makefile.in (install-arch-indep, uninstall):
        Ensure that INSTALL-type commands are run from top-level.
 
-       * Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally
-       omitted from 2012-04-12 backport from trunk.
-
        * info/dir: Make some entries consistent with the source texi files.
 
        * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.