![]() 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 |
16 years ago | |
---|---|---|
.. | ||
EGL | egl: include stdint.h to get the c99 integer typedefs | 16 years ago |
GL | Merge branch 'mesa_7_5_branch' | 16 years ago |
GLES | Merge branch 'master' into gallium-0.2 | 17 years ago |
GLES2 | Remove CVS keywords. | 17 years ago |