comparison src/image-load.c @ 1581:cef502852c4f

resolved conflict
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Fri, 01 May 2009 15:48:11 +0900
parents 597ed9e9979c
children 566abe50976d
comparison
equal deleted inserted replaced
1579:855d58cba862 1581:cef502852c4f