diff options
| author | Keith Whitwell <[email protected]> | 2009-12-01 14:31:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-12-01 14:31:14 +0000 |
| commit | 87eec80c1120d2cd9749ee360b77922feabf7f10 (patch) | |
| tree | e60d852329b2d8b981dcc1928a6f8d1a2254e120 /src/gallium/drivers/nv40/nv40_shader.h | |
| parent | 06d3732a9094030fc33120f16f162e0d405f132c (diff) | |
| parent | 5285de7c0fc067dc036a5b421140a696ce2cabbf (diff) | |
Merge commit 'origin/tgsi-simplify-ext'
Conflicts:
src/gallium/drivers/r300/r300_vs.c
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_shader.h')
0 files changed, 0 insertions, 0 deletions