diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
| commit | 87e3301533aa4d3e6e98db139887ebba3d217f7d (patch) | |
| tree | ad80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /src/mesa/pipe/SConscript | |
| parent | 49405c43f245d3b3ddd12e891413bf7ead23145c (diff) | |
| parent | 3320b1874e810583f95b93a89697b2955987b84f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/linux-dri
src/mesa/pipe/Makefile
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', -]) |