summaryrefslogtreecommitdiffstats
path: root/docs/README.D3D
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2009-01-08 12:31:14 +0000
committerJosé Fonseca <[email protected]>2009-01-08 12:31:14 +0000
commita3ee0aa1bb7c3f9dfc5b13b4e72522c10a22ad05 (patch)
tree8728f3cccc29ff993d551a90a590ff261da041d1 /docs/README.D3D
parent2d3953fd5ff91d9717d806a1fa3c8537efb8b67c (diff)
parentf8f9a1b620d31d1a59855fd502caed325d4a324f (diff)
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts: src/gallium/auxiliary/tgsi/tgsi_exec.c src/gallium/drivers/cell/spu/spu_command.h src/gallium/include/pipe/p_shader_tokens.h src/mesa/main/config.h src/mesa/main/mtypes.h src/mesa/shader/prog_execute.c src/mesa/shader/slang/slang_emit.c src/mesa/state_tracker/st_program.c src/mesa/state_tracker/wgl/stw_wgl.h src/mesa/state_tracker/wgl/stw_wgl_pixelformat.h
Diffstat (limited to 'docs/README.D3D')
0 files changed, 0 insertions, 0 deletions