summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/softpipe/sp_screen.h
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2008-09-23 17:40:49 -0700
committerKeith Whitwell <[email protected]>2008-09-23 17:40:49 -0700
commit2a7dc7927339322fbffaba62d2fb69373b94caf0 (patch)
treef59a65be187030739f409ae05432a025c2603789 /src/gallium/drivers/softpipe/sp_screen.h
parent62dd7575f07f3ff9803118113746dba9219c1390 (diff)
parent9acf207277b4de91b917b37a92f6b612f4710c80 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/shader/shader_api.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_screen.h')
0 files changed, 0 insertions, 0 deletions