summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-04-07 17:19:31 -0400
committerGlenn Morris <rgm@gnu.org>2014-04-07 17:19:31 -0400
commit6f287c898ab29c97bd90293df5f83af0e72c7ec7 (patch)
tree4ee23260a08b6bd953fe62a051f9daac2a55431e /src
parent7e31acf6b81fdce7258077645bc239767c484841 (diff)
ChangeLog fixes
Merged entries get today's date. May as well combine consecutive separate entries by same author into one. Backported entries should not appear twice.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d0d133c4989..bbdff0c79b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -13,22 +13,11 @@
(Fgarbage_collect): Use it.
(gc_sweep): Remove hack made unnecessary.
-2014-04-05 Glenn Morris <rgm@gnu.org>
+2014-04-07 Glenn Morris <rgm@gnu.org>
* keyboard.c (Fopen_dribble_file): Doc tweak.
-2014-04-04 Jan Djärv <jan.h.d@swipnet.se>
-
- Backport from trunk.
- * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool
- bar is zero height, just return (Bug#16976).
- (initFrameFromEmacs:): Initialize wait_for_tool_bar.
- * nsterm.h (EmacsView): Add wait_for_tool_bar.
- * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar
- is nil. If waiting for toolbar to complete, force a redraw.
- (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976).
-
-2014-04-03 Ken Brown <kbrown@cornell.edu>
+2014-04-07 Ken Brown <kbrown@cornell.edu>
* Makefile.in (EMACS_MANIFEST): Update comment. (Bug#17176)