summaryrefslogtreecommitdiffstats
path: root/progs/tests/SConscript
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-07-03 18:53:58 +0200
committerJakob Bornecrantz <jakob@vmware.com>2009-07-03 18:53:58 +0200
commit862488075c5537b0613753b0d14c267527fc6199 (patch)
treefd4d51272c86fbc88c12e2d16649547f3ca7b8df /progs/tests/SConscript
parent060c7f2321f72503c14f9f3f7bb27d59d8a90224 (diff)
parent94e1117c9ba259665cd8e790369dcd4c789a2f93 (diff)
downloadexternal_mesa3d-862488075c5537b0613753b0d14c267527fc6199.zip
external_mesa3d-862488075c5537b0613753b0d14c267527fc6199.tar.gz
external_mesa3d-862488075c5537b0613753b0d14c267527fc6199.tar.bz2
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.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 4c75246..b17fa90 100644
--- a/progs/tests/SConscript
+++ b/progs/tests/SConscript
@@ -110,6 +110,7 @@ progs = [
'tex1d',
'texcmp',
'texcompress2',
+ 'texcompsub',
'texdown',
'texfilt',
'texgenmix',