emacs-diffs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/src/ChangeLog

From: John Paul Wallington
Subject: [Emacs-diffs] Changes to emacs/src/ChangeLog
Date: Wed, 14 Dec 2005 22:59:35 +0000 
Index: emacs/src/ChangeLog
diff -u emacs/src/ChangeLog:1.4764 emacs/src/ChangeLog:1.4765
--- emacs/src/ChangeLog:1.4764  Wed Dec 14 20:58:32 2005
+++ emacs/src/ChangeLog Wed Dec 14 22:59:35 2005
@@ -15,7 +15,6 @@
 
        * coding.c (code_convert_region_unwind): GCPRO arg.
 
->>>>>>> 1.4762
 2005-12-12  Jan Dj,Ad(Brv  <address@hidden>
 
        * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,
reply via email to
[Prev in Thread] Current Thread [Next in Thread]