annotate msdos/emacs.ico @ 109388:64d1dc916ed8

Fix previous conflict.
author Kenichi Handa <handa@etlken>
date Wed, 14 Jul 2010 12:53:53 +0900
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)