Mercurial > emacs
diff lisp/image.el @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 6c819187f088 |
children | 5883fc00b976 68616bb3ae25 |
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 6c819187f088 |
children | 5883fc00b976 68616bb3ae25 |