Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 8 Jan 2010 15:21:12 +0000 (08:21 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 8 Jan 2010 15:21:12 +0000 (08:21 -0700)
Conflicts:

src/mesa/drivers/dri/i965/brw_wm_emit.c

1  2 
progs/demos/fire.c
progs/fp/SConscript
src/gallium/auxiliary/tgsi/tgsi_sse2.c
src/gallium/drivers/nv50/nv50_query.c
src/gallium/drivers/svga/svga_state_fs.c
src/mesa/Makefile
src/mesa/drivers/common/meta.c
src/mesa/drivers/dri/i965/brw_wm_emit.c
src/mesa/drivers/dri/r600/r600_texstate.c
src/mesa/shader/prog_optimize.c
src/mesa/tnl/t_vb_program.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge