diff options
| author | Brian Paul <[email protected]> | 2009-06-19 09:15:34 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-06-19 09:15:34 -0600 |
| commit | 9038b6c8bbda49c544d777c7cf7b107887421c77 (patch) | |
| tree | 7cfbf496dbc029ca134ede4669511cd6e94ef85a /progs/tests/Makefile | |
| parent | 0342229289c3bd5ed7bc595db4fc88003430209e (diff) | |
| parent | 0ddc4dbe43422211e6f3fb3278e7b2f55a25976b (diff) | |
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
Diffstat (limited to 'progs/tests/Makefile')
| -rw-r--r-- | progs/tests/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/tests/Makefile b/progs/tests/Makefile index 23fe3c35c1f..46f5b1c3a22 100644 --- a/progs/tests/Makefile +++ b/progs/tests/Makefile @@ -68,6 +68,7 @@ SOURCES = \ packedpixels.c \ pbo.c \ persp_hint.c \ + prim.c \ prog_parameter.c \ quads.c \ random.c \ |