diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-06-09 07:53:25 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-06-09 07:53:25 +0200 |
| commit | ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a (patch) | |
| tree | 308fa87e22a276c0f8f28fd9f0986d20b52be928 /progs/tests/Makefile | |
| parent | d9617deb008b75f4a605a30408aeb1948139c33e (diff) | |
| parent | 76a1017e978f8e51114d765c8c98ff25da13042b (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
Diffstat (limited to 'progs/tests/Makefile')
| -rw-r--r-- | progs/tests/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/progs/tests/Makefile b/progs/tests/Makefile index 1a3ba4f1816..5069817be3e 100644 --- a/progs/tests/Makefile +++ b/progs/tests/Makefile @@ -71,6 +71,8 @@ SOURCES = \ random.c \ readrate.c \ rubberband.c \ + scissor.c \ + scissor-viewport.c \ seccolor.c \ shader_api.c \ sharedtex.c \ |