diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
| commit | 733df0059f04e3fd7e3265d3c80dd8029f939c60 (patch) | |
| tree | 5073edcb41611b86c9a62fa75c2c089fd2babf48 /src/gallium/state_trackers/python/SConscript | |
| parent | 6fb364a1717858d8201b2caf234076ce5d4832ac (diff) | |
| parent | 5fa09846618ed702493f054a1d4b0ec2a28fbbd0 (diff) | |
Merge branch 'master' into gallium-new-formats
Conflicts:
src/gallium/auxiliary/util/u_format.csv
Diffstat (limited to 'src/gallium/state_trackers/python/SConscript')
| -rw-r--r-- | src/gallium/state_trackers/python/SConscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript index d0d141fd24..781f54bf2b 100644 --- a/src/gallium/state_trackers/python/SConscript +++ b/src/gallium/state_trackers/python/SConscript @@ -3,8 +3,7 @@ import os.path Import('*') -if 'python' in env['statetrackers'] and 0: - # FIXME: Disable python state tracker until transfers are done by contexts +if 'python' in env['statetrackers']: env = env.Clone() |