diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-02-02 12:17:01 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-02-02 12:17:01 +0000 |
| commit | e4d1757f81323636e99abc5fff411d42e19e901a (patch) | |
| tree | 4fd889e01445ce7c79688fa51dc78e9ad97be8c4 /src/mesa/SConscript | |
| parent | 59edbc70cd1042a884e7d153ba547c2f7f87318d (diff) | |
| parent | a38b8213ff1b99b73aae884e7b90be3d1999e3bf (diff) | |
Merge branch 'gallium-wgl-rework' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/shared/stw_public.h
Diffstat (limited to 'src/mesa/SConscript')
| -rw-r--r-- | src/mesa/SConscript | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 01620ee614..a878d31dbb 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -341,5 +341,3 @@ if env['platform'] != 'winddk': ) Export('glapi') - if platform == 'windows': - SConscript('state_tracker/wgl/SConscript') |