Mercurial > hg > xemacs-beta

diff src/ChangeLog @ 950:c1a972caf831

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-08-02 15:18:38 by youngs] 2002-08-03 Steve Youngs <youngs@xemacs.org> * objects-gtk.c: Fix '--with-mule' '--with-gtk' builds. From Vaclav Barta <vbar@comp.cz>.
author youngs
date Fri, 02 Aug 2002 15:18:46 +0000
parents 7a35465d73bc
children 93e076dd7825
line wrap: on
line diff
--- a/src/ChangeLog	Fri Aug 02 15:15:47 2002 +0000
+++ b/src/ChangeLog	Fri Aug 02 15:18:46 2002 +0000
@@ -38,7 +38,6 @@
 	* alloc.c: Fix various kkcc-related nits that show up in MULE and
 	union-type builds.
 
->>>>>>> 1.488
 2002-07-31  David Bush  <David.Bush@intel.com>
 
 	* events.c (event_equal): Correct comparison in MS Windows