Mercurial > emacs

diff src/ChangeLog.unicode @ 90202:7597b4a23c3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Tue, 19 Jul 2005 02:58:20 +0000
parents d940db5a66b9
children 709f27353024
line wrap: on
line diff
--- a/src/ChangeLog.unicode	Thu Jul 14 08:02:00 2005 +0000
+++ b/src/ChangeLog.unicode	Tue Jul 19 02:58:20 2005 +0000
@@ -1054,7 +1054,6 @@
 	* window.c (Fdisplay_buffer, Fframe_selected_window): Remove
 	unsued vars.
 
->>>>>>> 1.1.2.8
 2003-09-26  Dave Love  <fx@gnu.org>
 
 	* xterm.c (x_bitmap_mask): Declare.