diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
| commit | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (patch) | |
| tree | ad86feed38d780515cf9da608c5ea21eed04e17d /mesalib/src/mesa/main/attrib.c | |
| parent | 4f67039e9191d5251c39069bd791a05c5cf22022 (diff) | |
| parent | 873965b49f283ad028dd4e0e5b7e93a758c84993 (diff) | |
| download | vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.gz vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.bz2 vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXmu/src/CmapAlloc.c
Diffstat (limited to 'mesalib/src/mesa/main/attrib.c')
| -rw-r--r-- | mesalib/src/mesa/main/attrib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index d38a1a466..2f391c5a8 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -1352,7 +1352,6 @@ copy_pixelstore(struct gl_context *ctx, dst->SkipImages = src->SkipImages; dst->SwapBytes = src->SwapBytes; dst->LsbFirst = src->LsbFirst; - dst->ClientStorage = src->ClientStorage; dst->Invert = src->Invert; _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj); } |