merge from master
authorBrian <brian@yutani.localnet.net>
Wed, 21 Mar 2007 17:57:30 +0000 (11:57 -0600)
committerBrian <brian@yutani.localnet.net>
Wed, 21 Mar 2007 17:57:30 +0000 (11:57 -0600)
commit23d31efc167f09d47635352f697ffcb087d3ebbd
tree782f5bdcda8a4374501cae05a94a024fe1c26777
parent180cc2f8458c13ce415f7cdf9a425ae59cb6ad8b
parent88db19a48412cbe89196b1cc06e8ecf8ccae78b0
merge from master
25 files changed:
docs/relnotes-6.5.3.html
src/mesa/drivers/dri/i915/i915_state.c
src/mesa/drivers/dri/i915/i915_vtbl.c
src/mesa/drivers/dri/i915tex/i915_state.c
src/mesa/drivers/dri/i965/brw_vs_tnl.c
src/mesa/drivers/dri/nouveau/nouveau_context.c
src/mesa/drivers/dri/nouveau/nouveau_shader.c
src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
src/mesa/drivers/dri/nouveau/nouveau_shader_2.c
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_vertprog.c
src/mesa/main/colortab.c
src/mesa/main/get.c
src/mesa/main/get_gen.py
src/mesa/main/mtypes.h
src/mesa/main/pixel.c
src/mesa/shader/nvvertparse.c
src/mesa/shader/prog_instruction.c
src/mesa/shader/prog_instruction.h
src/mesa/shader/programopt.c
src/mesa/swrast/s_copypix.c
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_readpix.c
src/mesa/tnl/t_vp_build.c