Merge branch 'origin' into glsl-compiler-1
authorBrian <brian@yutani.localnet.net>
Fri, 9 Mar 2007 18:43:53 +0000 (11:43 -0700)
committerBrian <brian@yutani.localnet.net>
Fri, 9 Mar 2007 18:43:53 +0000 (11:43 -0700)
commit2cf5fd48d1586f961910a14324a457854cb66221
tree6b8690b1e3ac2b59369356d692214cc7d6a889c6
parent9f44247acf62b91669f77974a4bbad687d58859e
parentf9f79c8d770e696249bd98c68b563f887562c974
Merge branch 'origin' into glsl-compiler-1

Conflicts:

src/mesa/main/context.c
src/mesa/drivers/dri/nouveau/nouveau_context.c
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/main/context.c
src/mesa/main/mtypes.h
src/mesa/shader/arbprogparse.c
src/mesa/swrast/s_readpix.c
src/mesa/vbo/vbo_save_draw.c