Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 23 Oct 2009 00:38:19 +0000 (18:38 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 23 Oct 2009 00:38:19 +0000 (18:38 -0600)
commitab9d1011f5549502a4b960c2067cde69856a2719
tree21e45f55898d31001aa9cbc5ec5469974c94c75a
parent347fb3737be03488827d25610bec59cfb05bcab0
parent55058652b886b95bfc24109a9edb04d274c01c1a
Merge branch 'mesa_7_6_branch'
src/mesa/drivers/dri/i915/intel_tris.c
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/main/context.c