diff options
| author | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
| commit | e6b71530daea3059ee362d4df51575e27e026b22 (patch) | |
| tree | 8df01693aa4bf44360647d79a340cbb4156aa91a /src/mapi/glapi/gen/Makefile | |
| parent | 42c7291d2cb50c2bd94dd9346a8402a24303d66d (diff) | |
| parent | 5e3733fadf08178fca7c9f20a0f4783f940383aa (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
Diffstat (limited to 'src/mapi/glapi/gen/Makefile')
| -rw-r--r-- | src/mapi/glapi/gen/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile index ed1e664b8a8..5a9b6ac4a87 100644 --- a/src/mapi/glapi/gen/Makefile +++ b/src/mapi/glapi/gen/Makefile @@ -93,7 +93,9 @@ API_XML = \ EXT_transform_feedback.xml \ NV_conditional_render.xml \ NV_primitive_restart.xml \ - OES_EGL_image.xml + OES_EGL_image.xml \ + GL3x.xml + COMMON = $(API_XML) gl_XML.py glX_XML.py license.py typeexpr.py |