diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
| commit | 97fb1dadc6c52adeba0ac0684129520288ab794f (patch) | |
| tree | 6a3b54bec00abec5b571087dd001a33d62bf488c /mesalib/src/mesa/SConscript | |
| parent | b99cdb7509cad0b99761d19fe99637177913412b (diff) | |
| parent | d41bc08d1ae8c4784c09d8977816c0fadab1ba52 (diff) | |
| download | vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.gz vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.bz2 vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'mesalib/src/mesa/SConscript')
| -rw-r--r-- | mesalib/src/mesa/SConscript | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript index 3e42bfd8b..807608636 100644 --- a/mesalib/src/mesa/SConscript +++ b/mesalib/src/mesa/SConscript @@ -169,7 +169,6 @@ swrast_sources = [ 'swrast/s_logic.c', 'swrast/s_masking.c', 'swrast/s_points.c', - 'swrast/s_readpix.c', 'swrast/s_span.c', 'swrast/s_stencil.c', 'swrast/s_texcombine.c', |