Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e72ddbf9c409d106e1fe7061b59fb813c3ebf34..9bc28de681368601039271245f8116267cf3d53d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
+       when going to fullscreen (Bug#0x180004f).
 2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.