diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
| commit | e3734593aea202e99e77febea7b86c904080939f (patch) | |
| tree | 69856674e2062c55ec5eec95eb0e31225a943084 /progs/glsl/.gitignore | |
| parent | 221352bbd79a0ea92ce31cffb65537f62ee5668e (diff) | |
| parent | 5cad143e545775acacee294049345c6a3868c51d (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'progs/glsl/.gitignore')
| -rw-r--r-- | progs/glsl/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/progs/glsl/.gitignore b/progs/glsl/.gitignore index 5d954519b2..40df5bb978 100644 --- a/progs/glsl/.gitignore +++ b/progs/glsl/.gitignore @@ -21,3 +21,5 @@ texdemo1 toyball trirast twoside +vert-or-frag-only +vert-tex |