Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4386 emacs/src/ChangeLog:1.4387
*** emacs/src/ChangeLog:1.4386 Fri May 13 13:34:23 2005
--- emacs/src/ChangeLog Fri May 13 23:09:41 2005
***************
*** 51,57 ****
(unexec_malloc, unexec_realloc, unexec_free): Store and use
allocated size information in unexec_malloc_header.
- >>>>>>> 1.4385
2005-05-10 Richard M. Stallman <[EMAIL PROTECTED]>
* xterm.c (noinclude): Add #undef.
--- 51,56 ----
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
