Mercurial > emacs

diff src/ChangeLog @ 67584:c8432466c0f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author John Paul Wallington <jpw@pobox.com>
date Wed, 14 Dec 2005 22:59:35 +0000
parents 05d48e1da3ad
children 915691b6504f
line wrap: on
line diff
--- a/src/ChangeLog	Wed Dec 14 22:23:30 2005 +0000
+++ b/src/ChangeLog	Wed Dec 14 22:59:35 2005 +0000
@@ -15,7 +15,6 @@
 
 	* coding.c (code_convert_region_unwind): GCPRO arg.
 
->>>>>>> 1.4762
 2005-12-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,