diff options
| author | Jakob Bornecrantz <[email protected]> | 2010-01-14 22:31:04 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2010-01-14 22:31:04 +0000 |
| commit | b01ffb12ed82dcf435b186e2aff35e344a8a6ebe (patch) | |
| tree | a62ee3f8f402f0c34ac88b5011da41a9cab8c6e3 /progs/trivial | |
| parent | ffd28480560caecfb676a4bbe85a85672271e3f7 (diff) | |
| parent | 252812bf15c3479d921157b9a432c7e42d3b9446 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'progs/trivial')
| -rw-r--r-- | progs/trivial/tri-fbo-tex-mip.c | 1 | ||||
| -rw-r--r-- | progs/trivial/tri-fbo-tex.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/progs/trivial/tri-fbo-tex-mip.c b/progs/trivial/tri-fbo-tex-mip.c index 07443695011..df4725c7b4e 100644 --- a/progs/trivial/tri-fbo-tex-mip.c +++ b/progs/trivial/tri-fbo-tex-mip.c @@ -6,7 +6,6 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> #include <math.h> /* For debug */ diff --git a/progs/trivial/tri-fbo-tex.c b/progs/trivial/tri-fbo-tex.c index 8d1f871328d..eacb7d577be 100644 --- a/progs/trivial/tri-fbo-tex.c +++ b/progs/trivial/tri-fbo-tex.c @@ -6,8 +6,6 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> -#include <math.h> /* For debug */ |