Conflicts: ChangeLog configure.in |
||
---|---|---|
.. | ||
Makefile.am | ||
batch_crop.in | ||
batch_image_convert.in | ||
batch_rubber_sheet.in | ||
edvips.c | ||
find_mosaic.c | ||
header.c | ||
light_correct.in | ||
mergeup.c | ||
shrink_width.in | ||
vips-7.31 | ||
vips.c | ||
vipsthumbnail.c |
Conflicts: ChangeLog configure.in |
||
---|---|---|
.. | ||
Makefile.am | ||
batch_crop.in | ||
batch_image_convert.in | ||
batch_rubber_sheet.in | ||
edvips.c | ||
find_mosaic.c | ||
header.c | ||
light_correct.in | ||
mergeup.c | ||
shrink_width.in | ||
vips-7.31 | ||
vips.c | ||
vipsthumbnail.c |