summaryrefslogtreecommitdiffstats
path: root/progs/tests/SConscript
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-03-22 09:07:46 -0600
committerBrian Paul <brianp@vmware.com>2010-03-22 09:07:46 -0600
commit182c42c8da6edfa66819eef02f4dea310c1f68d7 (patch)
treef49df694eae81c9db3c8fe2123bb30ef5a556891 /progs/tests/SConscript
parent5cb4a3524b54480418b4c4717c4a0f0a8669939c (diff)
parentca97f8b9bab80844be613a9253643b7da8e738c7 (diff)
downloadexternal_mesa3d-182c42c8da6edfa66819eef02f4dea310c1f68d7.zip
external_mesa3d-182c42c8da6edfa66819eef02f4dea310c1f68d7.tar.gz
external_mesa3d-182c42c8da6edfa66819eef02f4dea310c1f68d7.tar.bz2
Merge branch '7.8'
Conflicts: src/gallium/drivers/cell/ppu/cell_screen.c src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'progs/tests/SConscript')
-rw-r--r--progs/tests/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/tests/SConscript b/progs/tests/SConscript
index 3580ba9..b1c7c99 100644
--- a/progs/tests/SConscript
+++ b/progs/tests/SConscript
@@ -45,6 +45,7 @@ progs = [
'copypixrate',
'crossbar',
'cva',
+ 'cva_huge',
'cylwrap',
'drawbuffers',
'drawbuffers2',