Brian Paul 0c309bb494 Merge branch 'mesa_7_5_branch' into mesa_7_6_branch ...

Conflicts:

	Makefile
	configs/default
	progs/glsl/Makefile
	src/gallium/auxiliary/util/u_simple_shaders.c
	src/gallium/state_trackers/glx/xlib/xm_api.c
	src/mesa/drivers/dri/i965/brw_draw_upload.c
	src/mesa/drivers/dri/i965/brw_vs_emit.c
	src/mesa/drivers/dri/intel/intel_context.h
	src/mesa/drivers/dri/intel/intel_pixel.c
	src/mesa/drivers/dri/intel/intel_pixel_read.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h

2009-09-09 08:33:39 -06:00

..

EGL

egl: also use X types for building on Apple/MacOS X

2009-09-08 09:20:43 -06:00

GL

gl: upgrade wglext.h to version 15

2009-08-03 11:24:09 -06:00

GLES

Merge branch 'master' into gallium-0.2

2008-09-21 10:28:06 -07:00

GLES2

Remove CVS keywords.

2008-08-31 17:43:20 +09:00

VG

OpenVG 1.0 State Tracker

2009-05-01 12:51:59 -04:00