Merge changes from emacs-23 branch

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 8cbcaf4afbcd11be8bf584852c3dc3f3e5706c2d..5aee468d9336a3549cd7b9114866e33196da842b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+       * xfaces.c (Fx_load_color_file):
+       Read color file from absolute filename (bug#8250).
+
 2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in: Update dependencies.