diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-01-16 23:21:06 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-01-16 23:21:06 +0000 |
| commit | ba5d600c90f7075cf2c33a0c5c679ef822e8746e (patch) | |
| tree | ec6794fba9f2fe563a8bbc03ca06e288b7f51c28 /progs/trivial/SConscript | |
| parent | fdfe06ad804ea13e6e436d66c1bcafe0bde2f545 (diff) | |
| parent | 164fd16cfbc09970676c2e6866e062a5c9b410db (diff) | |
| download | external_mesa3d-ba5d600c90f7075cf2c33a0c5c679ef822e8746e.zip external_mesa3d-ba5d600c90f7075cf2c33a0c5c679ef822e8746e.tar.gz external_mesa3d-ba5d600c90f7075cf2c33a0c5c679ef822e8746e.tar.bz2 | |
Merge remote branch 'origin/master' into lp-binning
Conflicts:
src/gallium/drivers/llvmpipe/lp_quad.h
src/gallium/drivers/llvmpipe/lp_setup.c
Diffstat (limited to 'progs/trivial/SConscript')
| -rw-r--r-- | progs/trivial/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript index 2906256..87a4d21 100644 --- a/progs/trivial/SConscript +++ b/progs/trivial/SConscript @@ -98,6 +98,7 @@ progs = [ 'tri-logicop-xor', 'tri-mask-tri', 'tri-orig', + 'tri-point-line-clipped', 'tri-query', 'tri-repeat', 'tri-scissor-tri', |