Merge branch 'gallium-vertex-linear' into gallium-0.1
authorJakob Bornecrantz <jakob@tungstengraphics.com>
Wed, 28 May 2008 10:42:42 +0000 (12:42 +0200)
committerJakob Bornecrantz <jakob@tungstengraphics.com>
Wed, 28 May 2008 10:42:42 +0000 (12:42 +0200)
Conflicts:

src/gallium/auxiliary/draw/draw_pt_varray.c

1  2 
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/auxiliary/draw/draw_vs_sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/gallium/auxiliary/translate/translate_generic.c
src/gallium/auxiliary/translate/translate_sse.c
src/gallium/drivers/softpipe/sp_context.c
src/gallium/include/pipe/p_compiler.h

Simple merge