diff options
| author | Zack Rusin <zackr@vmware.com> | 2009-11-16 22:39:05 -0500 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2009-11-16 22:39:05 -0500 |
| commit | 9b5f260756356a73984d60c907c525b8a2f8cf94 (patch) | |
| tree | b00a903c251e9b238b61971680f0836b2c72701f /progs/trivial/tri-alpha-tex.c | |
| parent | e0f4a4f702819d559d948170ba19830b9949b3d1 (diff) | |
| parent | aef3218f0bb48fdb286d2008ee07e507ea8aa98e (diff) | |
Merge remote branch 'origin/master' into arb_geometry_shader4
Conflicts:
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/drivers/softpipe/sp_state_derived.c
src/gallium/include/pipe/p_defines.h
Diffstat (limited to 'progs/trivial/tri-alpha-tex.c')
0 files changed, 0 insertions, 0 deletions