projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d90f97
7b85ea1
)
Merge branch 'gallium-vertex-linear' into gallium-0.1
author
Jakob Bornecrantz
<jakob@tungstengraphics.com>
Wed, 28 May 2008 10:42:42 +0000
(12:42 +0200)
committer
Jakob 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
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/auxiliary/draw/draw_vs_sse.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/auxiliary/translate/translate_generic.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/auxiliary/translate/translate_sse.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/drivers/softpipe/sp_context.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/include/pipe/p_compiler.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/gallium/auxiliary/draw/draw_pipe_aaline.c
Simple merge
diff --cc
src/gallium/auxiliary/draw/draw_vs_sse.c
Simple merge
diff --cc
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
Simple merge
diff --cc
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
Simple merge
diff --cc
src/gallium/auxiliary/translate/translate_generic.c
Simple merge
diff --cc
src/gallium/auxiliary/translate/translate_sse.c
Simple merge
diff --cc
src/gallium/drivers/softpipe/sp_context.c
Simple merge
diff --cc
src/gallium/include/pipe/p_compiler.h
Simple merge