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

..

arithmetic

Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge

2011-12-24 17:36:55 +00:00

cimg

switch to new vips_copy()

2011-10-15 06:49:59 +01:00

colour

move rad over to the new thing

2011-12-20 14:57:05 +00:00

conversion

remove wio_output

2011-12-21 12:08:29 +00:00

convolution

oop bandjoin bug

2011-12-16 12:25:39 +00:00

deprecated

Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge

2011-12-24 17:36:55 +00:00

foreign

Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge

2011-12-24 17:36:55 +00:00

freq_filt

remove dmalloc support

2011-09-23 17:12:47 +01:00

histograms_lut

small cleanups

2011-12-09 14:30:45 +00:00

include

Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge

2011-12-24 17:36:55 +00:00

inplace

remove dmalloc support

2011-09-23 17:12:47 +01:00

iofuncs

Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge

2011-12-24 17:36:55 +00:00

morphology

remove dmalloc support

2011-09-23 17:12:47 +01:00

mosaicing

switch to new vips_copy()

2011-10-15 06:49:59 +01:00

other

remove dmalloc support

2011-09-23 17:12:47 +01:00

resample

Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge

2011-12-24 17:36:55 +00:00

video

remove dmalloc support

2011-09-23 17:12:47 +01:00

dummy.c

merge gtkdoc branch

2009-08-16 15:00:08 +00:00

Makefile.am

Merge remote-tracking branch 'origin/gobject-introspection' into goi-merge

2011-12-24 17:36:55 +00:00