Merge branch 'ext-provoking-vertex'
authorBrian Paul <brianp@vmware.com>
Fri, 19 Jun 2009 15:15:34 +0000 (09:15 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 19 Jun 2009 15:15:34 +0000 (09:15 -0600)
commit9038b6c8bbda49c544d777c7cf7b107887421c77
tree7cfbf496dbc029ca134ede4669511cd6e94ef85a
parent0342229289c3bd5ed7bc595db4fc88003430209e
parent0ddc4dbe43422211e6f3fb3278e7b2f55a25976b
Merge branch 'ext-provoking-vertex'

Conflicts:

docs/relnotes-7.6.html
progs/tests/Makefile
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/glx/x11/indirect.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/dlist.c
src/mesa/main/enums.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
24 files changed:
docs/relnotes-7.6.html
progs/tests/Makefile
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/gallium/drivers/softpipe/sp_setup.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/glapi/EXT_provoking_vertex.xml
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/gl_API.xml
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/api_exec.c
src/mesa/main/context.c
src/mesa/main/dlist.c
src/mesa/main/enums.c
src/mesa/main/extensions.c
src/mesa/main/mtypes.h
src/mesa/sparc/glapi_sparc.S
src/mesa/state_tracker/st_atom_rasterizer.c
src/mesa/state_tracker/st_extensions.c
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S