Mercurial > emacs

diff src/ChangeLog @ 97952:2c2adcbee8a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_delete_display): Fix merge error.
author Andreas Schwab <schwab@suse.de>
date Tue, 02 Sep 2008 11:45:08 +0000
parents 9d28724e2c52
children da48a799510d
line wrap: on
line diff
--- a/src/ChangeLog	Tue Sep 02 09:03:10 2008 +0000
+++ b/src/ChangeLog	Tue Sep 02 11:45:08 2008 +0000
@@ -1,5 +1,7 @@
 2008-09-02  Andreas Schwab  <schwab@suse.de>
 
+	* xterm.c (x_delete_display): Fix merge error.
+
 	* fileio.c (Fexpand_file_name): Remove unused variables.
 
 2008-09-02  Eli Zaretskii  <eliz@gnu.org>