From 07908aec23241a9fa86093802d53688e1220903a Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 26 Nov 2005 11:07:23 +0000
Subject: [PATCH] *** empty log message ***

---
 nt/ChangeLog  | 6 ++++++
 src/ChangeLog | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7436cd7b47e..b436d7e8130 100644
--- 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 c67eb9c60b1..2175a0dcead 100644
--- 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.
-- 
2.39.2