diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-08-18 14:37:47 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-08-18 14:37:47 +0200 |
| commit | 3e54d63429fe7ca5db3c75c181abbaf7a7f55724 (patch) | |
| tree | e129c36aaef712525f0a04fc5b06c445e3cf84df /src/mesa/swrast/s_context.c | |
| parent | eaab76457818fad0926b84c663440e8987e1f19f (diff) | |
| parent | 85d9bc236d6a8ff8f12cbc2150f8c3740354f573 (diff) | |
Merge remote branch 'origin/master' into nv50-compiler
Diffstat (limited to 'src/mesa/swrast/s_context.c')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 6d2d17c61d..d8d8a80b7d 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -28,7 +28,6 @@ #include "main/imports.h" #include "main/bufferobj.h" -#include "main/context.h" #include "main/colormac.h" #include "main/mtypes.h" #include "main/teximage.h" |