diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-11-15 16:53:24 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-11-15 16:53:24 +0000 |
| commit | 7468765b18be202a64d58b83f6267b6973ea4897 (patch) | |
| tree | 6e9fa6dd4a2ff79787bcae247377d07c00a036cf /progs/xdemos/.gitignore | |
| parent | 5e1454a036be6da2c48e2e20bf6f8047ee1a94d3 (diff) | |
| parent | 80d6379722a1249ce13db79a898d340644936f67 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_print.c
Diffstat (limited to 'progs/xdemos/.gitignore')
| -rw-r--r-- | progs/xdemos/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/xdemos/.gitignore b/progs/xdemos/.gitignore index 868249db88..084dee5d84 100644 --- a/progs/xdemos/.gitignore +++ b/progs/xdemos/.gitignore @@ -1,4 +1,5 @@ corender +glsync glthreads glxcontexts glxdemo |