Brian Paul a04af335a4 Merge branch 'mesa_7_5_branch' ... Conflicts: src/mesa/drivers/dri/i915/i915_tex_layout.c src/mesa/drivers/dri/i965/brw_wm_glsl.c src/mesa/drivers/dri/intel/intel_buffer_objects.c src/mesa/drivers/dri/intel/intel_pixel_bitmap.c src/mesa/drivers/dri/intel/intel_pixel_draw.c src/mesa/main/enums.c src/mesa/main/texstate.c src/mesa/vbo/vbo_exec_array.c		2009-06-24 08:54:37 -06:00
..
EGL	egl: include stdint.h to get the c99 integer typedefs	2009-03-25 13:02:44 -06:00
GL	Merge branch 'mesa_7_5_branch'	2009-06-24 08:54:37 -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