Merge branch 'origin' into softpipe_0_1_branch
authorKeith Whitwell <keith@tungstengraphics.com>
Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)
commit6101fe641cd506422d0b2735dfcaa61174684ec4
tree78f14b3d199fbb9133076798dcd49e5992327d2e
parentbb1b01616b6cb9b0a1cab74e10940ce346cb8a3d
parent7b410f366fa117a03a7e838562215d2dca3f8cbc
Merge branch 'origin' into softpipe_0_1_branch
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_buffers.c
src/mesa/drivers/dri/i915tex/intel_context.c