diff options
| author | Brian Paul <[email protected]> | 2009-05-13 10:33:21 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-05-13 10:33:21 -0600 |
| commit | 3039acfc5db67f3935f9c30a9f17193ab52b20a9 (patch) | |
| tree | 49c770f360234977c1098e3d0c373da31ac7576c /src/mesa/main/arrayobj.h | |
| parent | 10c4a10b979bddd099287dec5b69243c2ade8ade (diff) | |
| parent | 2e4e34689022ecfcc7dc107427db90cc52a94d63 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/arrayobj.c
src/mesa/main/arrayobj.h
src/mesa/main/context.c
Diffstat (limited to 'src/mesa/main/arrayobj.h')
| -rw-r--r-- | src/mesa/main/arrayobj.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 9c2f340cfae..90c2aea1555 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -57,6 +57,7 @@ _mesa_initialize_array_object( GLcontext *ctx, struct gl_array_object *obj, GLuint name ); + /* * API functions */ |