From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 26 Nov 2005 11:07:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~5669
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07908aec23241a9fa86093802d53688e1220903a;p=emacs.git

*** empty log message ***
---

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.