Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
authorKeith Whitwell <keith@tungstengraphics.com>
Tue, 17 Jul 2007 10:06:02 +0000 (11:06 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Tue, 17 Jul 2007 10:06:02 +0000 (11:06 +0100)
commitbb1b01616b6cb9b0a1cab74e10940ce346cb8a3d
tree9649360604f4e6cf9e52096bbeef16a5369d2abf
parent2bf4a500de24347476ce96cdd48d68ddeecbb019
parent20cf13e03b1703937b4228aba8355b34d664aafb
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
src/mesa/drivers/dri/i915tex/intel_context.c