annotate msdos/emacs.ico @ 59458:df565ffe7247

(merge_faces): Rename from merge_into_realized_face. Callers changed. Add support to merge with lisp face id too (if face_name is t).
author Kim F. Storm <storm@cua.dk>
date Mon, 10 Jan 2005 13:35:11 +0000
parents 354e0c45cedf
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25856
Dave Love <fx@gnu.org>
parents:
diff changeset
1 (binary:image/vnd.microsoft.icon)