diff options
| author | Brian Paul <brianp@vmware.com> | 2010-10-21 19:05:40 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-10-21 19:05:47 -0600 |
| commit | 69a07be3e527dbc2148a4e20c50e60266225f5f2 (patch) | |
| tree | 82583b98708fc7a6c33b471d45670e2566ed0daf /src/mapi/glapi/gen/gl_API.xml | |
| parent | 1d91f8d9164b38b4c924f43ec4fc5ceb65c96a78 (diff) | |
| parent | b2d4dfe5cc5b24743175bf35285dfc57f86bc09d (diff) | |
Merge branch 'primitive-restart-cleanup'
Conflicts:
docs/relnotes-7.10.html
This branch is a re-do of the primitive-restart branch with all
the intermediate/temporary stuff cleaned out.
Diffstat (limited to 'src/mapi/glapi/gen/gl_API.xml')
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index d391895f87..d1139aa06e 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -7967,6 +7967,8 @@ <xi:include href="NV_conditional_render.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="NV_primitive_restart.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> |