diff options
| author | José Fonseca <[email protected]> | 2010-01-16 23:21:06 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2010-01-16 23:21:06 +0000 |
| commit | ba5d600c90f7075cf2c33a0c5c679ef822e8746e (patch) | |
| tree | ec6794fba9f2fe563a8bbc03ca06e288b7f51c28 /progs/trivial/Makefile | |
| parent | fdfe06ad804ea13e6e436d66c1bcafe0bde2f545 (diff) | |
| parent | 164fd16cfbc09970676c2e6866e062a5c9b410db (diff) | |
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/Makefile')
| -rw-r--r-- | progs/trivial/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index 784715db162..d13f28de204 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -121,6 +121,7 @@ SOURCES = \ tri-lit-material.c \ tri-mask-tri.c \ tri-orig.c \ + tri-point-line-clipped.c \ tri-query.c \ tri-repeat.c \ tri-scissor-tri.c \ |