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)
1  2 
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/main/dlist.c

Simple merge