John Cupitt 2a81c611c5 Merge remote-tracking branch 'origin/7.36' ... Conflicts: ChangeLog configure.ac libvips/deprecated/im_exr2vips.c libvips/foreign/radiance.c		2014-01-09 14:30:52 +00:00
..
vips	Merge remote-tracking branch 'origin/7.36'	2014-01-09 14:30:52 +00:00
Makefile.am	merge gtkdoc branch	2009-08-16 15:00:08 +00:00