Mercurial > emacs

changeset 98233:4cd1e1167e99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 19 Sep 2008 01:35:59 +0000
parents e3190eb9e11b
children dc12281f6c35
files src/ChangeLog
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Sep 19 00:37:30 2008 +0000
+++ b/src/ChangeLog	Fri Sep 19 01:35:59 2008 +0000
@@ -45,7 +45,6 @@
 	* xmenu.c (menu_position_func): Use x_display_pixel_height and
 	x_display_pixel_width.
 
->>>>>>> 1.6978
 2008-09-18  Kenichi Handa  <handa@m17n.org>
 
 	* composite.c (fill_gstring_header): Don't check FROM and TO here.
@@ -151,7 +150,6 @@
 	* indent.c (Fvertical_motion): Be sure to set
 	it_overshoot_expected if it.cmp_it.id is non-nengative.
 
->>>>>>> 1.6977
 2008-09-07  Andreas Schwab  <schwab@suse.de>
 
 	* callproc.c (Fcall_process): Don't hold references to string data