diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
commit | b59657ad965f9471574e914b861bb1d2a17d772e (patch) | |
tree | 99a4fe6dc933472516de91773da04034626a84b5 /src/mesa/main/enable.c | |
parent | 325196f548f8e46aa8fcc7b030e81ba939e7f6b7 (diff) | |
parent | 2ddc8799a8e243cb10cd69ea9424f72b6c4de534 (diff) |
Merge branch 'vbo-0.2'
Conflicts:
src/mesa/main/texcompress_s3tc.c
src/mesa/tnl/t_array_api.c
Diffstat (limited to 'src/mesa/main/enable.c')
-rw-r--r-- | src/mesa/main/enable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 076d8731f8..0d54c29949 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -56,7 +56,7 @@ static void client_state(GLcontext *ctx, GLenum cap, GLboolean state) { GLuint flag; - GLuint *var; + GLboolean *var; switch (cap) { case GL_VERTEX_ARRAY: |