projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ffd2848 252812b)
Merge branch 'mesa_7_7_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Thu, 14 Jan 2010 22:31:04 +0000 (22:31 +0000)
committerJakob Bornecrantz <jakob@vmware.com>
Thu, 14 Jan 2010 22:31:04 +0000 (22:31 +0000)
commitb01ffb12ed82dcf435b186e2aff35e344a8a6ebe
treea62ee3f8f402f0c34ac88b5011da41a9cab8c6e3tree
parentffd28480560caecfb676a4bbe85a85672271e3f7commit | diff
parent252812bf15c3479d921157b9a432c7e42d3b9446commit | diff
Merge branch 'mesa_7_7_branch'

Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
20 files changed:
progs/demos/engine.c diff1 | diff2 | blob | history
progs/demos/fire.c diff1 | diff2 | blob | history
progs/demos/isosurf.c diff1 | diff2 | blob | history
progs/demos/morph3d.c diff1 | diff2 | blob | history
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c diff1 | diff2 | blob | history
src/gallium/auxiliary/tgsi/tgsi_exec.c diff1 | diff2 | blob | history
src/gallium/drivers/r300/r300_flush.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_state_fs.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_state_vs.c diff1 | diff2 | blob | history
src/gallium/state_trackers/dri/dri_drawable.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_xv.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_program.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_texture.c diff1 | diff2 | blob | history
src/mesa/swrast/s_accum.c diff1 | diff2 | blob | history
src/mesa/swrast/s_bitmap.c diff1 | diff2 | blob | history
src/mesa/swrast/s_copypix.c diff1 | diff2 | blob | history
src/mesa/swrast/s_drawpix.c diff1 | diff2 | blob | history
src/mesa/tnl/t_draw.c diff1 | diff2 | blob | history
src/mesa/tnl/t_pipeline.c diff1 | diff2 | blob | history
src/mesa/tnl/t_vb_program.c diff1 | diff2 | blob | history