Mercurial > emacs

diff src/ChangeLog @ 62300:758f5cc54b97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Richard M. Stallman <rms@gnu.org>
date Fri, 13 May 2005 23:09:41 +0000
parents 5401d9510369
children 178dce14498b
line wrap: on
line diff
--- a/src/ChangeLog	Fri May 13 23:07:41 2005 +0000
+++ b/src/ChangeLog	Fri May 13 23:09:41 2005 +0000
@@ -51,7 +51,6 @@
 	(unexec_malloc, unexec_realloc, unexec_free): Store and use
 	allocated size information in unexec_malloc_header.
 
->>>>>>> 1.4385
 2005-05-10  Richard M. Stallman  <rms@gnu.org>
 
 	* xterm.c (noinclude): Add #undef.