annotate etc/photos/jamesm.png @ 4550:1217f19ce196

Merge. HG: changed lisp/ChangeLog
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 21 Jan 2008 22:54:43 +0100
parents 5dad2072e5f0
children 3742ea8250b5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2368
5dad2072e5f0 [xemacs-hg @ 2004-11-05 19:29:42 by youngs]
youngs
parents: 2367
diff changeset
1 (binary:image/png)