Mercurial > emacs

changeset 32354:eaa80d9a03d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove CVS merge cookie left in.
author Miles Bader <miles@gnu.org>
date Tue, 10 Oct 2000 02:32:57 +0000
parents 803ca8bc08b2
children 6bf2ae19e286
files src/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Oct 10 02:00:52 2000 +0000
+++ b/src/ChangeLog	Tue Oct 10 02:32:57 2000 +0000
@@ -33,7 +33,6 @@
 	(syms_of_msdos): Don't intern and don't staticpro
 	Qbackground_color and Qforeground_color.
 
->>>>>>> 1.946
 2000-10-07  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* frame.c (Fframe_parameter): For non-windowed frames, if