diff options
| author | Alan Hourihane <[email protected]> | 2009-01-22 09:43:42 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2009-01-22 09:43:42 +0000 |
| commit | 4df482086ebf0663c708b089d8d8d22de0ef972c (patch) | |
| tree | e802cc36b266bfdeb80ab9e55643c50f5a5e6d9c /progs/tests/Makefile | |
| parent | 01cbd764962ff49bf104e5997914ced53360ef81 (diff) | |
| parent | b8bd0b0ddc357f9b430bb6ddeb60c5a2179d3791 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
windows/VC8/mesa/osmesa/osmesa.vcproj
windows/VC8/progs/demos/gears.vcproj
windows/VC8/progs/progs.sln
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 b96ad9f4b46..34c9ab1dcef 100644 --- a/progs/tests/Makefile +++ b/progs/tests/Makefile @@ -26,6 +26,7 @@ SOURCES = \ arraytexture.c \ blendminmax.c \ blendsquare.c \ + blendxor.c \ bufferobj.c \ bug_3050.c \ bug_3101.c \ @@ -65,6 +66,7 @@ SOURCES = \ quads.c \ random.c \ readrate.c \ + rubberband.c \ seccolor.c \ shader_api.c \ sharedtex.c \ |