summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-01-11 16:19:21 +0000
committerKeith Whitwell <keithw@vmware.com>2009-01-11 16:19:21 +0000
commite37a3aed95ea91a7ddbabc4bed1fac7c451fe695 (patch)
tree9efa59fb8015a58146d7a50a3b6039e5fbe3a60d /progs
parent61e843ff4bf9b9e8c4a7a8a485cee852a4f1dd86 (diff)
parent83a525af95bbb8012b9d7ee6b766621d6bb2d701 (diff)
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Diffstat (limited to 'progs')
-rw-r--r--progs/glsl/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/glsl/.gitignore b/progs/glsl/.gitignore
index 40df5bb978..04b679c521 100644
--- a/progs/glsl/.gitignore
+++ b/progs/glsl/.gitignore
@@ -14,6 +14,7 @@ pointcoord
points
readtex.c
readtex.h
+samplers
shaderutil.c
shaderutil.h
skinning