diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
| commit | 59d54334c96f44ed1d8bf660dc96221362a77d04 (patch) | |
| tree | e9ab34e568256bcdc2a88602c47072ab769211e8 /progs/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 'progs/SConscript')
| -rw-r--r-- | progs/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/progs/SConscript b/progs/SConscript index 631923a38f..6484c761fc 100644 --- a/progs/SConscript +++ b/progs/SConscript @@ -1,6 +1,8 @@ SConscript([ 'util/SConscript', 'demos/SConscript', + 'redbook/SConscript', + 'samples/SConscript', 'trivial/SConscript', 'vp/SConscript', ]) |