Merge branch 'gallium-edgeflags'
authorRoland Scheidegger <sroland@vmware.com>
Tue, 22 Dec 2009 19:54:26 +0000 (20:54 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Tue, 22 Dec 2009 19:54:26 +0000 (20:54 +0100)
commit35e8283c69d80debb44b05ea79dc5f67303a7432
treeaacfe7f201094793c3d29ec0ddcc71cb01f7476c
parent00b463fc30b30911797c5d5eaaeae79b7a36589b
parent420ff89067515a74c9625a103cadc267d5f64bd4
Merge branch 'gallium-edgeflags'

Conflicts:
src/mesa/state_tracker/st_draw.c
12 files changed:
src/gallium/auxiliary/tgsi/tgsi_dump.c
src/gallium/auxiliary/tgsi/tgsi_scan.c
src/gallium/auxiliary/tgsi/tgsi_scan.h
src/gallium/drivers/nv30/nv30_context.h
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_state_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_vs.c
src/gallium/drivers/svga/svga_context.h
src/gallium/include/pipe/p_shader_tokens.h
src/mesa/state_tracker/st_draw.c
src/mesa/state_tracker/st_program.c