diff options
author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml | |
parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml index 71d2c7290..eb872098d 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml @@ -13,7 +13,7 @@ <enum name="PROVOKING_VERTEX_EXT" value="0x8E4F"/> <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT" value="0x8E4C"/> - <function name="ProvokingVertexEXT" offset="assign"> + <function name="ProvokingVertexEXT" alias="ProvokingVertex"> <param name="mode" type="GLenum"/> </function> @@ -26,7 +26,7 @@ <enum name="PROVOKING_VERTEX" value="0x8E4F"/> <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION" value="0x8E4C"/> - <function name="ProvokingVertex" alias="ProvokingVertexEXT"> + <function name="ProvokingVertex" offset="assign"> <param name="mode" type="GLenum"/> </function> |