Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b1a9c59033a07af3a8cfdda52088e72aa89c3f6..bdec3c9cde14a6fb88831afed693b153a1f74efb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-18  Glenn Morris  <rgm@gnu.org>
+
+       * frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is
+       nil/not present in the parameter alist.  (Bug#19680)
+
 2015-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * alloc.c (purecopy): Handle hash-tables.