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 c17aeb21ae1..04b09c8d4a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -673,7 +673,6 @@ | |||
| 673 | (shrink_mini_window): Restore old window sizes only if old | 673 | (shrink_mini_window): Restore old window sizes only if old |
| 674 | size information is valid in all windows in a window tree. | 674 | size information is valid in all windows in a window tree. |
| 675 | 675 | ||
| 676 | >>>>>>> 1.44 | ||
| 677 | 1999-10-15 Gerd Moellmann <gerd@gnu.org> | 676 | 1999-10-15 Gerd Moellmann <gerd@gnu.org> |
| 678 | 677 | ||
| 679 | * xmenu.c (set_frame_menubar): Don't call | 678 | * xmenu.c (set_frame_menubar): Don't call |