diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /mesalib/docs | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'mesalib/docs')
| -rw-r--r-- | mesalib/docs/envvars.html | 2 | ||||
| -rw-r--r-- | mesalib/docs/install.html | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/mesalib/docs/envvars.html b/mesalib/docs/envvars.html index 8c5c6abf7..4b5e89926 100644 --- a/mesalib/docs/envvars.html +++ b/mesalib/docs/envvars.html @@ -84,8 +84,6 @@ See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details. <li>MESA_GAMMA - gamma correction coefficients for red, green, blue channels <li>MESA_XSYNC - enable synchronous X behavior (for debugging only) <li>MESA_GLX_FORCE_CI - if set, force GLX to treat 8bpp visuals as CI visuals -<li>MESA_GLX_FX - set to either "fullscreen" for full-screen rendering, - "window" to render into a window, or "disable" to disable the Glide driver. <li>MESA_GLX_FORCE_ALPHA - if set, forces RGB windows to have an alpha channel. <li>MESA_GLX_DEPTH_BITS - specifies default number of bits for depth buffer. <li>MESA_GLX_ALPHA_BITS - specifies default number of bits for alpha channel. diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html index 85047913d..07e38bf3d 100644 --- a/mesalib/docs/install.html +++ b/mesalib/docs/install.html @@ -304,17 +304,8 @@ Documentation for other environments (some may be very out of date): <UL> <li><A HREF="README.VMS">README.VMS</A> - VMS -<LI><A HREF="README.GGI">README.GGI</A> - GGI -<LI><A HREF="README.3DFX">README.3DFX</A> - 3Dfx/Glide driver -<LI><A HREF="README.AMIWIN">README.AMIWIN</A> - Amiga Amiwin -<LI><A HREF="README.D3D">README.D3D</A> - Direct3D driver -<LI><A HREF="README.DJ">README.DJ</A> - DJGPP -<LI><A HREF="README.LYNXOS">README.LYNXOS</A> - LynxOS -<LI><A HREF="README.MINGW32">README.MINGW32</A> - Mingw32 -<LI><A HREF="README.NeXT">README.NeXT</A> - NeXT -<LI><A HREF="README.OpenStep">README.OpenStep</A> - OpenStep -<LI><A HREF="README.OS2">README.OS2</A> - OS/2 -<LI><A HREF="README.WINDML">README.WINDML</A> - WindML +<LI><A HREF="README.CYGWIN">README.CYGWIN</A> - Cygwin +<LI><A HREF="README.WIN32">README.WIN32</A> - Win32 </UL> |