Merge branch 'gallium-tex-surfaces' into gallium-0.1
authorJakob Bornecrantz <jakob@tungstengraphics.com>
Fri, 30 May 2008 11:46:18 +0000 (13:46 +0200)
committerJakob Bornecrantz <jakob@tungstengraphics.com>
Fri, 30 May 2008 11:46:18 +0000 (13:46 +0200)
Conflicts:

src/gallium/drivers/i915simple/i915_context.h

1  2 
src/gallium/auxiliary/draw/draw_vs_sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/translate/translate_sse.c