Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	libX11/configure.ac
	libX11/specs/libX11/AppC.xml
	libX11/specs/libX11/AppD.xml
	libX11/specs/libX11/CH03.xml
	libX11/specs/libX11/CH04.xml
	libX11/specs/libX11/CH05.xml
	libX11/specs/libX11/CH06.xml
	libX11/specs/libX11/CH07.xml
	libX11/specs/libX11/CH08.xml
	libX11/specs/libX11/CH09.xml
	libX11/specs/libX11/CH11.xml
	libX11/specs/libX11/CH12.xml
	libX11/specs/libX11/CH13.xml
	libX11/specs/libX11/CH14.xml
	libX11/specs/libX11/CH15.xml
	libX11/specs/libX11/CH16.xml
	libxcb/configure.ac
	libxcb/src/c_client.py
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_util.c
	mesalib/common.py
	mesalib/configs/linux-dri
	mesalib/docs/GL3.txt
	mesalib/docs/download.html
	mesalib/docs/install.html
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp-parse.y
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_clone.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/glsl/opt_tree_grafting.cpp
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_XML.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mapi/mapi/u_thread.c
	mesalib/src/mapi/mapi/u_thread.h
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
	mesalib/src/mesa/main/api_arrayelt.c
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pbo.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shared.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/program/register_allocate.c
	mesalib/src/mesa/program/register_allocate.h
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/tnl/t_draw.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	pixman/pixman/pixman-arm-common.h
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-inlines.h
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h
	xorg-server/configure.ac
	xorg-server/fb/fbblt.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 0 insertions, 18 deletions

diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html
index b82b1d743..313f36337 100644
--- a/mesalib/docs/install.html
+++ b/mesalib/docs/install.html
@@ -157,9 +157,6 @@ lrwxrwxrwx    1 brian    users          20 Mar 26 07:53 libGLU.so.1 -> libGLU.so
 lrwxrwxrwx    1 brian    users          12 Mar 26 07:53 libglut.so -> libglut.so.3*

 lrwxrwxrwx    1 brian    users          16 Mar 26 07:53 libglut.so.3 -> libglut.so.3.7.1*

 -rwxr-xr-x    1 brian    users      597754 Mar 26 07:53 libglut.so.3.7.1*

-lrwxrwxrwx    1 brian    users          11 Mar 26 08:04 libGLw.so -> libGLw.so.1*

-lrwxrwxrwx    1 brian    users          15 Mar 26 08:04 libGLw.so.1 -> libGLw.so.1.0.0*

--rwxr-xr-x    1 brian    users       20750 Mar 26 08:04 libGLw.so.1.0.0*

 lrwxrwxrwx    1 brian    users          14 Mar 26 07:53 libOSMesa.so -> libOSMesa.so.6*

 lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -> libOSMesa.so.6.1.060100*

 -rwxr-xr-x    1 brian    users       23871 Mar 26 07:53 libOSMesa.so.6.1.060100*

@@ -172,8 +169,6 @@ lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -> libOSM
 <br>

 <b>libglut</b> is the GLUT library.

 <br>

-<b>libGLw</b> is the Xt/Motif OpenGL drawing area widget library.

-<br>

 <b>libOSMesa</b> is the OSMesa (Off-Screen) interface library.

 </p>

 

@@ -181,22 +176,10 @@ lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -> libOSM
 If you built the DRI hardware drivers, you'll also see the DRI drivers:

 </p>

 <pre>

--rwxr-xr-x   1 brian users 15607851 Jul 21 12:11 ffb_dri.so

--rwxr-xr-x   1 brian users 15148747 Jul 21 12:11 i810_dri.so

--rwxr-xr-x   1 brian users 14497814 Jul 21 12:11 i830_dri.so

 -rwxr-xr-x   1 brian users 16895413 Jul 21 12:11 i915_dri.so

--rwxr-xr-x   1 brian users 11320803 Jul 21 12:11 mach64_dri.so

--rwxr-xr-x   1 brian users 11418014 Jul 21 12:12 mga_dri.so

--rwxr-xr-x   1 brian users 11064426 Jul 21 12:12 r128_dri.so

 -rwxr-xr-x   1 brian users 11849858 Jul 21 12:12 r200_dri.so

 -rwxr-xr-x   1 brian users 16050488 Jul 21 12:11 r300_dri.so

 -rwxr-xr-x   1 brian users 11757388 Jul 21 12:12 radeon_dri.so

--rwxr-xr-x   1 brian users 11232304 Jul 21 12:13 s3v_dri.so

--rwxr-xr-x   1 brian users 11062970 Jul 21 12:13 savage_dri.so

--rwxr-xr-x   1 brian users 11214212 Jul 21 12:13 sis_dri.so

--rwxr-xr-x   1 brian users 11368736 Jul 21 12:13 tdfx_dri.so

--rwxr-xr-x   1 brian users 10598868 Jul 21 12:13 trident_dri.so

--rwxr-xr-x   1 brian users 10997120 Jul 21 12:13 unichrome_dri.so

 </pre>

 

 <p>

@@ -327,7 +310,6 @@ Documentation for other environments (some may be very out of date):
 <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.BEOS">README.BEOS</A> - BeOS

 <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