diff options
author | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
commit | 3fbadc13acf6beb4a2497970367e2c2c1b6039ca (patch) | |
tree | 44bc51faf9ba2bf08022a268f1a85c55fc4431ca /mesalib/docs/autoconf.html | |
parent | 4b424e0ba999b47ca62298e8104f76f940aac4d8 (diff) | |
parent | 2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (diff) | |
download | vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.gz vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.bz2 vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/configure.ac
mesalib/configs/linux-dri
mesalib/docs/download.html
mesalib/src/SConscript
mesalib/src/mesa/main/bufferobj.c
mesalib/src/mesa/main/bufferobj.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/program/program.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/dix/window.c
xorg-server/xkb/xkb.c
xorg-server/xkb/xkmread.c
Diffstat (limited to 'mesalib/docs/autoconf.html')
-rw-r--r-- | mesalib/docs/autoconf.html | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mesalib/docs/autoconf.html b/mesalib/docs/autoconf.html index 936ddcffe..64bcbd48a 100644 --- a/mesalib/docs/autoconf.html +++ b/mesalib/docs/autoconf.html @@ -21,7 +21,6 @@ <ul> <li><a href="#glu">GLU</a></li> <li><a href="#glw">GLw</a></li> - <li><a href="#glut">GLUT</a></li> </ul> <li><a href="#demos">Demo Program Options</a></li> </ol> @@ -252,13 +251,6 @@ on all drivers. This can be disable with the option if libGLU has been enabled. This can be disable with the option <code>--disable-glw</code>. </li> - -<a name="glut"> -<li><b><em>GLUT</em></b> - The libglut library will be built by default -if libGLU has been enabled and the glut source code from the MesaGLUT -tarball is available. This can be disable with the option -<code>--disable-glut</code>. -</li> </ul> </p> |