# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1133003243 0
# Node ID 27721497966eb5ed942a8f3e864e2c2baf886621
# Parent  c5ff1098b0b878c7e9c2e90fafa1717f791b808a
*** empty log message ***

diff -r c5ff1098b0b8 -r 27721497966e nt/ChangeLog
--- a/nt/ChangeLog	Sat Nov 26 11:06:53 2005 +0000
+++ b/nt/ChangeLog	Sat Nov 26 11:07:23 2005 +0000
@@ -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 -r c5ff1098b0b8 -r 27721497966e src/ChangeLog
--- a/src/ChangeLog	Sat Nov 26 11:06:53 2005 +0000
+++ b/src/ChangeLog	Sat Nov 26 11:07:23 2005 +0000
@@ -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.