Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 2609ed7dd01cea7ee601ed00df25ea74dda24a7f..7a30c6e897ab3109fe83a7d16a0c9081f3d608c5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * buffer.c (syms_of_buffer): Doc fix.  (Bug#19841)
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
        * xfaces.c (map_tty_color): Use assoc_no_quit instead of