diff lisp/image.el @ 109388:64d1dc916ed8

Fix previous conflict.
author Kenichi Handa <handa@etlken>
date Wed, 14 Jul 2010 12:53:53 +0900
parents 6c819187f088
children 5883fc00b976 68616bb3ae25
line wrap: on
line diff