[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/09/02 11:45:16

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6941
retrieving revision 1.6942
diff -u -b -r1.6941 -r1.6942
--- ChangeLog   2 Sep 2008 08:13:20 -0000       1.6941
+++ ChangeLog   2 Sep 2008 11:45:08 -0000       1.6942
@@ -1,5 +1,7 @@
 2008-09-02  Andreas Schwab  <address@hidden>
 
+       * xterm.c (x_delete_display): Fix merge error.
+
        * fileio.c (Fexpand_file_name): Remove unused variables.
 
 2008-09-02  Eli Zaretskii  <address@hidden>