diff options
| author | Ian Romanick <[email protected]> | 2010-08-13 20:22:46 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-08-13 20:22:46 -0700 |
| commit | 443a7e4e9a360acbc3e662c098be436f180bf81d (patch) | |
| tree | 71125fc394bdcbc17cd7ed74c592b9a7761541f8 /src/mesa/main/texstore.c | |
| parent | 2f8ee757ab324d599fcb8287789eb5f1a7890d74 (diff) | |
| parent | 27041d7cb3faeaed483538a228573466363ec1c7 (diff) | |
Merge branch 'master' into glsl2
Diffstat (limited to 'src/mesa/main/texstore.c')
| -rw-r--r-- | src/mesa/main/texstore.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 0f21395af39..2989fdb72ed 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -55,7 +55,6 @@ #include "glheader.h" #include "bufferobj.h" #include "colormac.h" -#include "context.h" #include "convolve.h" #include "image.h" #include "macros.h" |