Mercurial > emacs

diff src/ChangeLog @ 111270:83641cd010c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
author Glenn Morris <rgm@gnu.org>
date Sun, 31 Oct 2010 15:35:44 -0700
parents 8da6c861bf9f
children 707be8bc83af
line wrap: on
line diff
--- a/src/ChangeLog	Sun Oct 31 22:31:24 2010 +0000
+++ b/src/ChangeLog	Sun Oct 31 15:35:44 2010 -0700
@@ -1,5 +1,7 @@
 2010-10-31  Glenn Morris  <rgm@gnu.org>
 
+	* xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
+
 	* frame.c (syms_of_frame) <tool-bar-mode>:
 	Default to nil if !HAVE_WINDOW_SYSTEM.  (Bug#7299)