diff options
| author | José Fonseca <jfonseca@vmware.com> | 2008-12-22 19:31:52 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2008-12-22 19:31:52 +0000 |
| commit | 9136c9b29ed5c14bc89a4c4e3a391e0b097092e1 (patch) | |
| tree | 75268d994baf85d58b4542124862189f44645c06 /progs/trivial/.gitignore | |
| parent | ce8469abeb8d48d84a77f3ddd1664d9f98d7d620 (diff) | |
| parent | 5f36c5b2c59bb8be53d3712b3896b448ef086c74 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/util/Makefile
Diffstat (limited to 'progs/trivial/.gitignore')
| -rw-r--r-- | progs/trivial/.gitignore | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/trivial/.gitignore b/progs/trivial/.gitignore index 4789cf8475..8bf6e45650 100644 --- a/progs/trivial/.gitignore +++ b/progs/trivial/.gitignore @@ -79,11 +79,6 @@ tri-cull tri-cull-both tri-dlist tri-edgeflag -trifan -trifan-flat -trifan-flat-clip -trifan-flat-unfilled-clip -trifan-unfilled tri-fbo tri-fbo-tex tri-flat @@ -112,6 +107,11 @@ tri-unfilled-userclip-stip tri-userclip tri-z tri-z-eq +trifan +trifan-flat +trifan-flat-clip +trifan-flat-unfilled-clip +trifan-unfilled tristrip tristrip-clip tristrip-flat |