aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJan D2015-04-03 14:02:13 +0200
committerJan D2015-04-03 14:02:13 +0200
commitfb77948660d9a1d21339bb9657e1227063911ddc (patch)
tree62d5ed5318ef27c48abbe2ecdedd2498973d25cc /src/ChangeLog
parent75c8741afba2321add3ad52c5143b4fdb1d63e18 (diff)
parentc775195c62843deed10e7967e488b3b04b84c412 (diff)
downloademacs-fb77948660d9a1d21339bb9657e1227063911ddc.tar.gz
emacs-fb77948660d9a1d21339bb9657e1227063911ddc.zip
Merge branch 'master' into cairo, fixes tooltips not shown.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8fe0e6f892a..e41da251ec6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12015-04-03 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xterm.c (handle_one_xevent): Always redraw tool tips on
4 MapNotify. Update tool tip frame sizes on ConfigureNotify.
5
12015-03-31 Eli Zaretskii <eliz@gnu.org> 62015-03-31 Eli Zaretskii <eliz@gnu.org>
2 7
3 * keyboard.c (read_key_sequence): Don't let 8 * keyboard.c (read_key_sequence): Don't let