diff options
| author | Richard M. Stallman | 2005-05-13 23:09:41 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-05-13 23:09:41 +0000 |
| commit | 6840d3505d26ba586cc8b9b07441299efd642050 (patch) | |
| tree | 827f3a2f0ffb418aa48c217e52b158748adcba19 /src/ChangeLog | |
| parent | d90b02af14c8dd515d42c77c93c8d156df5742f8 (diff) | |
| download | emacs-6840d3505d26ba586cc8b9b07441299efd642050.tar.gz emacs-6840d3505d26ba586cc8b9b07441299efd642050.zip | |
(Finsert_file_contents): Fix previous change.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b89d61d2d52..70e78fd7731 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | (unexec_malloc, unexec_realloc, unexec_free): Store and use | 51 | (unexec_malloc, unexec_realloc, unexec_free): Store and use |
| 52 | allocated size information in unexec_malloc_header. | 52 | allocated size information in unexec_malloc_header. |
| 53 | 53 | ||
| 54 | >>>>>>> 1.4385 | ||
| 55 | 2005-05-10 Richard M. Stallman <rms@gnu.org> | 54 | 2005-05-10 Richard M. Stallman <rms@gnu.org> |
| 56 | 55 | ||
| 57 | * xterm.c (noinclude): Add #undef. | 56 | * xterm.c (noinclude): Add #undef. |