Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 16 Sep 2009 14:57:19 +0000 (07:57 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Wed, 16 Sep 2009 14:57:19 +0000 (07:57 -0700)
commit88e3a5760559e6ced00a57b7157abe156c22be2e
tree8e609a807590d9f98b9dfbf7d5ffd64ffc7c0d86
parent76e836a41ad47237f80195c5dacb8bc57a7f2b69
parent2921a2555d0a76fa649b23c31e3264bbc78b2ff5
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:
src/mesa/main/dlist.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/main/dlist.c