John Cupitt 40604e776a Merge remote-tracking branch 'origin/master' into colour ... Conflicts: libvips/colour/im_icc_transform.c		2012-10-25 08:58:17 +01:00
..
include	Fix .PHONY Make targets	2012-10-21 14:24:59 -04:00
Makefile.am	Fix .PHONY Make targets	2012-10-21 14:24:59 -04:00
VDisplay.cc	remove disp stuff, just sRGB now	2012-09-24 11:23:32 +01:00
VError.cc
VImage.cc
vipsc++.cc	update the C++ binding	2012-08-06 22:02:34 +01:00
VMask.cc