diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-10-10 16:40:16 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-10-10 16:40:16 -0600 |
| commit | 2a6c6fe01e84ffd54b47ea11aa766960df6ddcaf (patch) | |
| tree | d0cab73abfa138f30cb74371bbb16060893b6c07 /src/mesa/main/getstring.c | |
| parent | 01e312a73b68dc5ddffca0d1b1472fc5dcb6f59e (diff) | |
| parent | 24748268a3ac7bedc2c9ae5bf76c4c741d539f80 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/main/getstring.c')
| -rw-r--r-- | src/mesa/main/getstring.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 1a82ccce59..94bf5de1e8 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -25,7 +25,6 @@ #include "glheader.h" -#include "colormac.h" #include "context.h" #include "get.h" #include "version.h" |