Merge branch 'mesa_7_6_branch'
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 16 Sep 2009 15:05:36 +0000 (08:05 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Wed, 16 Sep 2009 15:05:36 +0000 (08:05 -0700)
commit5ce72c559c027ea03513ed9c0038706733b0586e
tree6f68190074317a17ec77dc710492ea12661eb2c7
parentaabcc6cb23d7f7cb0d0dec418f6d3ade8962ba24
parent88e3a5760559e6ced00a57b7157abe156c22be2e
Merge branch 'mesa_7_6_branch'
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/main/dlist.c