John Cupitt b948f17c02 Merge remote-tracking branch 'origin/7.26' ...

Conflicts:
	ChangeLog
	configure.in
	libvips/include/vips/vips.h
	libvips/include/vips/vips7compat.h
	libvips/iofuncs/image.c
	libvips/iofuncs/init.c
	po/vips7.pot

2011-10-11 21:49:06 +01:00

0 lines

Plaintext

Raw Blame History