Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 85 insertions, 85 deletions

diff --git a/mesalib/docs/MESA_release_buffers.spec b/mesalib/docs/MESA_release_buffers.spec
index e906e1459..52d1e5a9c 100644
--- a/mesalib/docs/MESA_release_buffers.spec
+++ b/mesalib/docs/MESA_release_buffers.spec
@@ -1,85 +1,85 @@
-Name

-

-    MESA_release_buffers

-

-Name Strings

-

-    GLX_MESA_release_buffers

-

-Contact

-

-    Brian Paul (brian.paul 'at' tungstengraphics.com)

-

-Status

-

-    Shipping since Mesa 2.0 in October, 1996.

-

-Version

-

-    Last Modified Date:  8 June 2000

-

-Number

-

-    217

-

-Dependencies

-

-    OpenGL 1.0 or later is required.

-    GLX 1.0 or later is required.

-

-Overview

-

-    Mesa's implementation of GLX is entirely implemented on the client side.

-    Therefore, Mesa cannot immediately detect when an X window or pixmap is

-    destroyed in order to free any ancillary data associated with the window

-    or pixmap.

-

-    The glxMesaReleaseBuffers() function can be used to explicitly indicate

-    when the back color buffer, depth buffer, stencil buffer, and/or accumu-

-    lation buffer associated with a drawable can be freed.

-

-IP Status

-

-    Open-source; freely implementable.

-

-Issues

-

-    None.

-

-New Procedures and Functions

-

-    Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );

-

-New Tokens

-

-    None.

-

-Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)

-

-    The function

-

-	Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );

-

-    causes all software ancillary buffers (back buffer, depth, stencil,

-    accum, etc) associated with the named drawable to be immediately

-    deallocated.  True is returned if <d> is a valid Mesa GLX drawable,

-    else False is returned.  After calling glXReleaseBuffersMESA, the

-    drawable should no longer be used for GL rendering.  Results of

-    attempting to do so are undefined.

-

-

-GLX Protocol

-

-    None, since this is a client-side operation.

-

-Errors

-

-    None.

-

-New State

-

-    None.

-

-Revision History

-

-    8 June 2000 - initial specification

+Name
+
+    MESA_release_buffers
+
+Name Strings
+
+    GLX_MESA_release_buffers
+
+Contact
+
+    Brian Paul (brian.paul 'at' tungstengraphics.com)
+
+Status
+
+    Shipping since Mesa 2.0 in October, 1996.
+
+Version
+
+    Last Modified Date:  8 June 2000
+
+Number
+
+    217
+
+Dependencies
+
+    OpenGL 1.0 or later is required.
+    GLX 1.0 or later is required.
+
+Overview
+
+    Mesa's implementation of GLX is entirely implemented on the client side.
+    Therefore, Mesa cannot immediately detect when an X window or pixmap is
+    destroyed in order to free any ancillary data associated with the window
+    or pixmap.
+
+    The glxMesaReleaseBuffers() function can be used to explicitly indicate
+    when the back color buffer, depth buffer, stencil buffer, and/or accumu-
+    lation buffer associated with a drawable can be freed.
+
+IP Status
+
+    Open-source; freely implementable.
+
+Issues
+
+    None.
+
+New Procedures and Functions
+
+    Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
+
+New Tokens
+
+    None.
+
+Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)
+
+    The function
+
+	Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
+
+    causes all software ancillary buffers (back buffer, depth, stencil,
+    accum, etc) associated with the named drawable to be immediately
+    deallocated.  True is returned if <d> is a valid Mesa GLX drawable,
+    else False is returned.  After calling glXReleaseBuffersMESA, the
+    drawable should no longer be used for GL rendering.  Results of
+    attempting to do so are undefined.
+
+
+GLX Protocol
+
+    None, since this is a client-side operation.
+
+Errors
+
+    None.
+
+New State
+
+    None.
+
+Revision History
+
+    8 June 2000 - initial specification