Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 17 Jun 2009 00:25:52 +0000 (18:25 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 17 Jun 2009 00:25:52 +0000 (18:25 -0600)
commit8d482227915552c414e13743652e6794c4313ae2
tree27bb35b40ec242836320180370d7fd5fa3820f41
parent4ef1f8e3b52a06fcf58f78c9c36738531b91dbac
parent6b917d0b1787280f976c2f0d1ead0e5d7587a3e9
Merge branch 'mesa_7_5_branch'

Conflicts:

src/mesa/main/api_validate.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/softpipe/sp_setup.c
src/gallium/include/pipe/p_thread.h
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/drivers/dri/i965/brw_wm_fp.c
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/main/api_validate.c
src/mesa/swrast/s_texfilter.c