diff options
author | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
commit | bf805d3bf5bf191aa669b6155316a78917cf9b0e (patch) | |
tree | d76223fb22381485f7ecc8f6c7d026dcd88d80f3 /progs/demos | |
parent | 9e06cf00cfb24528653913fc90eded4d370c1149 (diff) | |
parent | 72c888869f4e5074e57c349ec356798959be791e (diff) |
Merge branch 'master' into i915-superioctl
Diffstat (limited to 'progs/demos')
-rw-r--r-- | progs/demos/.gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/demos/.gitignore b/progs/demos/.gitignore index 508b8a56f4..9c5957602c 100644 --- a/progs/demos/.gitignore +++ b/progs/demos/.gitignore @@ -41,8 +41,8 @@ shadowtex showbuffer.c showbuffer.h singlebuffer -spriteblast spectex +spriteblast stex3d streaming_rect teapot |