diff options
| author | Michel Dänzer <[email protected]> | 2010-03-30 12:01:31 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2010-03-30 12:01:31 +0200 |
| commit | e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829 (patch) | |
| tree | 0c73ae897b0cfb09ad21e13e27f45bb11b82e75b /progs | |
| parent | aa1a79036003c2aeaae24877da66e9b46a059cad (diff) | |
| parent | 07c6d94cd7272524ef06b2a787667e5d626137d2 (diff) | |
Merge branch '7.8'
Conflicts:
Makefile
src/mesa/main/version.h
Resolved by keeping version strings from master (also in the intel driver).
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/tests/SConscript | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/progs/tests/SConscript b/progs/tests/SConscript index b1c7c99a7b6..037a0c35dad 100644 --- a/progs/tests/SConscript +++ b/progs/tests/SConscript @@ -9,7 +9,6 @@ glx_progs = [ 'getprocaddress', 'jkrahntest', 'sharedtex', - 'texcompress2', 'texobjshare', ] |