Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorIan Romanick <ian.d.romanick@intel.com>
Thu, 10 Sep 2009 18:24:56 +0000 (11:24 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 10 Sep 2009 18:24:56 +0000 (11:24 -0700)
commit8398535331dae39ff5f52e94a69abdbf7507a343
tree5e551923af0f9924d66ec8cf36e3486c8825e16f
parentacfea5c705f383692e661d37c5cd7da2f3db559b
parent2dd3da3a4a2233332219f9da60d18fec79b4b6c7
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_chipset.h
src/mesa/drivers/dri/intel/intel_context.c