Merge from origin/emacs-24

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4c0c116ba5adc3a5f9705e2ab638bca146ed6d3e..1819989775e4113e283cbc457ccc6c558cd77e62 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * frames.texi (Display Feature Testing): Make the description of
+       x-server-version and x-server-vendor less X-specific.  (Bug#19502)
+
 2015-01-15  Eli Zaretskii  <eliz@gnu.org>
 
        * streams.texi (Input Functions): Document 'set-binary-mode'.