projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ae1c0a0
b57abd3
)
Merge branch 'mesa_7_7_branch'
author
Brian Paul
<brianp@vmware.com>
Tue, 22 Dec 2009 01:35:54 +0000
(18:35 -0700)
committer
Brian Paul
<brianp@vmware.com>
Tue, 22 Dec 2009 01:35:54 +0000
(18:35 -0700)
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
19 files changed:
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
configure.ac
patch
|
diff1
|
diff2
|
blob
|
history
progs/demos/readpix.c
patch
|
diff1
|
diff2
|
blob
|
history
progs/demos/textures.c
patch
|
diff1
|
diff2
|
blob
|
history
src/gallium/state_trackers/xorg/xorg_exa.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/i915/i915_texstate.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/r128/r128_tris.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/r300/r300_texstate.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/savage/savagetris.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/sis/sis_tris.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/unichrome/via_tris.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/shader/slang/slang_compile.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/state_tracker/st_draw.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/state_tracker/st_gen_mipmap.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/state_tracker/st_program.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/swrast_setup/ss_tritmp.h
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/tnl_dd/t_dd_dmatmp.h
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/tnl_dd/t_dd_tritmp.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile
Simple merge
diff --cc
configure.ac
Simple merge
diff --cc
progs/demos/readpix.c
Simple merge
diff --cc
progs/demos/textures.c
Simple merge
diff --cc
src/gallium/state_trackers/xorg/xorg_exa.c
Simple merge
diff --cc
src/mesa/drivers/dri/i915/i915_texstate.c
Simple merge
diff --cc
src/mesa/drivers/dri/r128/r128_tris.c
Simple merge
diff --cc
src/mesa/drivers/dri/r300/r300_texstate.c
Simple merge
diff --cc
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
Simple merge
diff --cc
src/mesa/drivers/dri/savage/savagetris.c
Simple merge
diff --cc
src/mesa/drivers/dri/sis/sis_tris.c
Simple merge
diff --cc
src/mesa/drivers/dri/unichrome/via_tris.c
Simple merge
diff --cc
src/mesa/shader/slang/slang_compile.c
Simple merge
diff --cc
src/mesa/state_tracker/st_draw.c
Simple merge
diff --cc
src/mesa/state_tracker/st_gen_mipmap.c
Simple merge
diff --cc
src/mesa/state_tracker/st_program.c
Simple merge
diff --cc
src/mesa/swrast_setup/ss_tritmp.h
Simple merge
diff --cc
src/mesa/tnl_dd/t_dd_dmatmp.h
Simple merge
diff --cc
src/mesa/tnl_dd/t_dd_tritmp.h
Simple merge