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/get.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/get.c')
| -rw-r--r-- | mesalib/src/mesa/main/get.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index 45b27777a..827906900 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -888,7 +888,6 @@ static const struct value_desc values[] = { { GL_UNPACK_SWAP_BYTES, CONTEXT_BOOL(Unpack.SwapBytes), NO_EXTRA }, { GL_UNPACK_SKIP_IMAGES_EXT, CONTEXT_INT(Unpack.SkipImages), NO_EXTRA }, { GL_UNPACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Unpack.ImageHeight), NO_EXTRA }, - { GL_UNPACK_CLIENT_STORAGE_APPLE, CONTEXT_BOOL(Unpack.ClientStorage), NO_EXTRA }, { GL_ZOOM_X, CONTEXT_FLOAT(Pixel.ZoomX), NO_EXTRA }, { GL_ZOOM_Y, CONTEXT_FLOAT(Pixel.ZoomY), NO_EXTRA }, |