mesa/windows
Brian Paul 1f196b786d Merge branch 'texformat-rework'
Conflicts:
	src/mesa/drivers/dri/radeon/radeon_fbo.c
	src/mesa/drivers/dri/s3v/s3v_tex.c
	src/mesa/drivers/dri/s3v/s3v_xmesa.c
	src/mesa/drivers/dri/trident/trident_context.c
	src/mesa/main/debug.c
	src/mesa/main/mipmap.c
	src/mesa/main/texformat.c
	src/mesa/main/texgetimage.c
2009-10-28 21:24:11 -06:00
..
VC6/progs/glut Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
VC7 Merge branch 'texformat-rework' 2009-10-28 21:24:11 -06:00
VC8 Merge branch 'texformat-rework' 2009-10-28 21:24:11 -06:00