Merge from emacs-24; up to 2014-07-20T16:14:58Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75dac546c0ff53ec7b55dba2df7bef8bbfa0604a..375bfcf45dba84ea083e32135ca3b427d6382c63 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-04  Glenn Morris  <rgm@gnu.org>
+
+       * frame.el (frame-monitor-attributes)
+       (display-monitor-attributes-list): Doc fixes.
+
 2014-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Merge trivially safe differences from standalone CC-mode.