diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-02-15 11:15:47 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-02-15 11:15:47 +0000 |
| commit | 6ac2c1cc0cd1253ba2014d459010032127f185ec (patch) | |
| tree | 6348de9de19e7394800a983c8c614566d22b870b /src/mesa/pipe/SConscript | |
| parent | c04a7f8929d674971a472ffa4d3a31200c22aa5a (diff) | |
| parent | 6d3831b11d9f5aaba61cc2fb8ade61437ad7c335 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.1
Conflicts:
src/gallium/drivers/softpipe/sp_quad_fs.c
src/gallium/drivers/softpipe/sp_state.h
src/gallium/drivers/softpipe/sp_state_fs.c
Diffstat (limited to 'src/mesa/pipe/SConscript')
| -rw-r--r-- | src/mesa/pipe/SConscript | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/mesa/pipe/SConscript b/src/mesa/pipe/SConscript deleted file mode 100644 index d9c20e0100..0000000000 --- a/src/mesa/pipe/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import('*') - -#env = env.Clone() - -SConscript([ - 'softpipe/SConscript', - 'i915simple/SConscript', - 'i965simple/SConscript', -]) |