John Cupitt 0983b50905 Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge ... Conflicts: TODO libvips/arithmetic/im_recomb.c libvips/arithmetic/im_stats.c libvips/deprecated/im_measure.c libvips/include/vips/header.h libvips/include/vips/image.h libvips/include/vips/object.h libvips/iofuncs/header.c libvips/iofuncs/image.c libvips/iofuncs/object.c		2011-12-24 17:36:55 +00:00
..
vips	Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge	2011-12-24 17:36:55 +00:00
Makefile.am	merge gtkdoc branch	2009-08-16 15:00:08 +00:00