*** empty log message ***

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7436cd7b47e839e19f5a88556c9eec415a901c27..b436d7e8130a2dabb8334f595b7425284d0b015a 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacs21.ico: Renamed from emacs.ico.
+       * emacs.ico: New icons from Andrew Zhilin
+       <andrew_zhilin@yahoo.com>.
+
 2005-09-10  Eli Zaretskii  <eliz@gnu.org>
 
        * config.nt (HAVE_GET_CURRENT_DIR_NAME): Undefine.

diff --git a/src/ChangeLog b/src/ChangeLog
index c67eb9c60b163a3a9df787bbcfc1f4cff296b33a..2175a0dcead234b2a4bcbd5d882abb118eeff169 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-26  Henrik Enberg  <henrik.enberg@telia.com>
+
+       * xfaces.c (Finternal_set_lisp_face_attribute_from_resource): 
+       Handle :inherit property as a lisp expression.
+
 2005-11-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * macterm.c (Qcontrol): Rename from Qctrl.  All uses changed.