diff options
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. |