annotate msdos/emacs.ico @ 112018:b0a317b18658

* admin/bzrmerge.el: New file to help merge branches while skipping some revisions (e.g. from emacs-23 to trunk).
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 26 Dec 2010 20:27:08 -0500
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)