diff options
| author | Keith Whitwell <[email protected]> | 2009-02-16 19:50:48 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-02-16 19:50:48 +0000 |
| commit | 59d54334c96f44ed1d8bf660dc96221362a77d04 (patch) | |
| tree | e9ab34e568256bcdc2a88602c47072ab769211e8 /src/glut/glx/SConscript | |
| parent | 7c8836e9ef49d938aa55a1c385b95c6371c301f1 (diff) | |
| parent | c5c383596ddb26cd75e4b355918ad16915283b59 (diff) | |
Merge branch 'master' into gallium-texture-transfer
Conflicts:
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/glut/glx/SConscript')
| -rw-r--r-- | src/glut/glx/SConscript | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glut/glx/SConscript b/src/glut/glx/SConscript index cb442ba027f..938fec03df2 100644 --- a/src/glut/glx/SConscript +++ b/src/glut/glx/SConscript @@ -10,7 +10,6 @@ target = 'glut32' env.Replace(CPPDEFINES = [ 'BUILD_GLUT32', 'GLUT_BUILDING_LIB', - 'MESA', 'NDEBUG', 'GLUT_NO_WARNING_DISABLE', ]) |