Merge branch 'master' into drm-gem
authorIan Romanick <ian.d.romanick@intel.com>
Sat, 26 Jul 2008 01:31:44 +0000 (18:31 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Sat, 26 Jul 2008 01:31:44 +0000 (18:31 -0700)
commit1e645b365900cf1c71ca5594bd6b549a1f203040
treed114e55df428550c9829acf929b9fb7bcb89c429
parente5022c3fdf9888857f22f9a1690035ff3f90d36b
parent9bc9e0ecb0fb2069b2c123e665eb2118e358098f
Merge branch 'master' into drm-gem

Conflicts:

src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
14 files changed:
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/i915/i830_context.c
src/mesa/drivers/dri/i915/i915_context.c
src/mesa/drivers/dri/i965/brw_clip_state.c
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_defines.h
src/mesa/drivers/dri/i965/brw_misc_state.c
src/mesa/drivers/dri/intel/intel_batchbuffer.h
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_buffers.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_tex_image.c
src/mesa/drivers/dri/intel/intel_tex_validate.c
src/mesa/main/fbobject.c