diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
| commit | a512985fd81c1ed4ccc5e69aaa05015cf7ff844d (patch) | |
| tree | 69e6e898deaeaed2b4dfb5851707c68261c464de /progs/glsl/.gitignore | |
| parent | 0b5af41c6fae2809f4567a7cecbd207e5e4f3ab5 (diff) | |
| parent | c80bc3abcd3939e5e2d45aea4b01ff22bfec244b (diff) | |
Merge branch 'master' into asm-shader-rework-1
Conflicts:
src/mesa/shader/arbprogparse.c
Diffstat (limited to 'progs/glsl/.gitignore')
| -rw-r--r-- | progs/glsl/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/glsl/.gitignore b/progs/glsl/.gitignore index 39d90c23ac..986775bac2 100644 --- a/progs/glsl/.gitignore +++ b/progs/glsl/.gitignore @@ -22,6 +22,7 @@ samplers_array shaderutil.c shaderutil.h shadow_sampler +shtest skinning texaaline texdemo1 |