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)
commit3869c3c87a40d9f41414082ad8dd3d747e6b34d8
tree04d493660504d59b7e2d3c8b2a5178b3865b84ec
parent2ade5268dca67a73d3f5f8cc41ea86d1e48de9f0
parent012c0dd6321e858af22389f98201c8dcb8f8780c
Merge branch 'gallium-tex-surfaces' into gallium-0.1

Conflicts:

src/gallium/drivers/i915simple/i915_context.h
src/gallium/auxiliary/draw/draw_vs_sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/translate/translate_sse.c