summaryrefslogtreecommitdiffstats
path: root/progs/redbook
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-01-14 22:31:04 +0000
committerJakob Bornecrantz <[email protected]>2010-01-14 22:31:04 +0000
commitb01ffb12ed82dcf435b186e2aff35e344a8a6ebe (patch)
treea62ee3f8f402f0c34ac88b5011da41a9cab8c6e3 /progs/redbook
parentffd28480560caecfb676a4bbe85a85672271e3f7 (diff)
parent252812bf15c3479d921157b9a432c7e42d3b9446 (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/redbook')
-rw-r--r--progs/redbook/aapoly.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/progs/redbook/aapoly.c b/progs/redbook/aapoly.c
index b7b2b270902..64d06b7b3da 100644
--- a/progs/redbook/aapoly.c
+++ b/progs/redbook/aapoly.c
@@ -45,7 +45,6 @@
#include <GL/glut.h>
#include <stdlib.h>
#include <stdio.h>
-#include <string.h>
GLboolean polySmooth = GL_TRUE;