libvips/libvips/video
John Cupitt 56bab17678 Merge remote-tracking branch 'origin/7.26'
Conflicts:
	ChangeLog
	TODO
	configure.in
	libvips/deprecated/dispatch_types.c
	libvips/foreign/tiff2vips.c
	libvips/include/vips/image.h
	libvips/iofuncs/header.c
	libvips/iofuncs/operation.c
	po/vips7.pot
2012-01-14 14:00:41 +00:00
..
Makefile.am merge gtkdoc branch 2009-08-16 15:00:08 +00:00
im_video_test.c remove dmalloc support 2011-09-23 17:12:47 +01:00
im_video_v4l1.c Merge remote-tracking branch 'origin/7.26' 2012-01-14 14:00:41 +00:00
im_video_v4l1.h merge gtkdoc branch 2009-08-16 15:00:08 +00:00
video_dispatch.c remove dmalloc support 2011-09-23 17:12:47 +01:00