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, 110 insertions, 110 deletions

diff --git a/X11/extensions/securproto.h b/X11/extensions/securproto.h
index 409a4c5d0..56cd475cc 100644
--- a/X11/extensions/securproto.h
+++ b/X11/extensions/securproto.h
@@ -1,110 +1,110 @@
-/*
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-*/
-
-#ifndef _SECURPROTO_H
-#define _SECURPROTO_H
-
-#include <X11/extensions/secur.h>
-
-#define X_SecurityQueryVersion		0
-#define X_SecurityGenerateAuthorization 1
-#define X_SecurityRevokeAuthorization   2
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       securityReqType;
-    CARD16      length B16;
-    CARD16      majorVersion B16;
-    CARD16      minorVersion B16;
-} xSecurityQueryVersionReq;
-#define sz_xSecurityQueryVersionReq 	8
-
-typedef struct {
-    CARD8   type;
-    CARD8   pad0;
-    CARD16  sequenceNumber B16;
-    CARD32  length	 B32;
-    CARD16  majorVersion B16;
-    CARD16  minorVersion B16;
-    CARD32  pad1	 B32;
-    CARD32  pad2	 B32;
-    CARD32  pad3	 B32;
-    CARD32  pad4	 B32;
-    CARD32  pad5	 B32;
- } xSecurityQueryVersionReply;
-#define sz_xSecurityQueryVersionReply  	32
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       securityReqType;
-    CARD16      length B16;
-    CARD16	nbytesAuthProto B16;
-    CARD16	nbytesAuthData B16;
-    CARD32	valueMask B32;
-    /* auth protocol name padded to 4 bytes */
-    /* auth protocol data padded to 4 bytes */
-    /* list of CARD32 values, if any */
-} xSecurityGenerateAuthorizationReq;
-#define sz_xSecurityGenerateAuthorizationReq 12
-
-typedef struct {
-    CARD8   type;
-    CARD8   pad0;
-    CARD16  sequenceNumber B16;
-    CARD32  length	 B32;
-    CARD32  authId	 B32;
-    CARD16  dataLength   B16;
-    CARD16  pad1	 B16;
-    CARD32  pad2	 B32;
-    CARD32  pad3	 B32;
-    CARD32  pad4	 B32;
-    CARD32  pad5	 B32;
- } xSecurityGenerateAuthorizationReply;
-#define sz_xSecurityGenerateAuthorizationReply  	32
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       securityReqType;
-    CARD16      length B16;
-    CARD32	authId B32;
-} xSecurityRevokeAuthorizationReq;
-#define sz_xSecurityRevokeAuthorizationReq 8
-
-typedef struct _xSecurityAuthorizationRevokedEvent {
-    BYTE	type;
-    BYTE	detail;
-    CARD16	sequenceNumber B16;
-    CARD32	authId B32;
-    CARD32	pad0	 B32;
-    CARD32	pad1	 B32;
-    CARD32	pad2	 B32;
-    CARD32	pad3	 B32;
-    CARD32	pad4	 B32;
-    CARD32	pad5	 B32;
-} xSecurityAuthorizationRevokedEvent;
-#define sz_xSecurityAuthorizationRevokedEvent 32
-
-#endif /* _SECURPROTO_H */
+/*

+Copyright 1996, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+*/

+

+#ifndef _SECURPROTO_H

+#define _SECURPROTO_H

+

+#include <X11/extensions/secur.h>

+

+#define X_SecurityQueryVersion		0

+#define X_SecurityGenerateAuthorization 1

+#define X_SecurityRevokeAuthorization   2

+

+typedef struct {

+    CARD8       reqType;

+    CARD8       securityReqType;

+    CARD16      length B16;

+    CARD16      majorVersion B16;

+    CARD16      minorVersion B16;

+} xSecurityQueryVersionReq;

+#define sz_xSecurityQueryVersionReq 	8

+

+typedef struct {

+    CARD8   type;

+    CARD8   pad0;

+    CARD16  sequenceNumber B16;

+    CARD32  length	 B32;

+    CARD16  majorVersion B16;

+    CARD16  minorVersion B16;

+    CARD32  pad1	 B32;

+    CARD32  pad2	 B32;

+    CARD32  pad3	 B32;

+    CARD32  pad4	 B32;

+    CARD32  pad5	 B32;

+ } xSecurityQueryVersionReply;

+#define sz_xSecurityQueryVersionReply  	32

+

+typedef struct {

+    CARD8       reqType;

+    CARD8       securityReqType;

+    CARD16      length B16;

+    CARD16	nbytesAuthProto B16;

+    CARD16	nbytesAuthData B16;

+    CARD32	valueMask B32;

+    /* auth protocol name padded to 4 bytes */

+    /* auth protocol data padded to 4 bytes */

+    /* list of CARD32 values, if any */

+} xSecurityGenerateAuthorizationReq;

+#define sz_xSecurityGenerateAuthorizationReq 12

+

+typedef struct {

+    CARD8   type;

+    CARD8   pad0;

+    CARD16  sequenceNumber B16;

+    CARD32  length	 B32;

+    CARD32  authId	 B32;

+    CARD16  dataLength   B16;

+    CARD16  pad1	 B16;

+    CARD32  pad2	 B32;

+    CARD32  pad3	 B32;

+    CARD32  pad4	 B32;

+    CARD32  pad5	 B32;

+ } xSecurityGenerateAuthorizationReply;

+#define sz_xSecurityGenerateAuthorizationReply  	32

+

+typedef struct {

+    CARD8       reqType;

+    CARD8       securityReqType;

+    CARD16      length B16;

+    CARD32	authId B32;

+} xSecurityRevokeAuthorizationReq;

+#define sz_xSecurityRevokeAuthorizationReq 8

+

+typedef struct _xSecurityAuthorizationRevokedEvent {

+    BYTE	type;

+    BYTE	detail;

+    CARD16	sequenceNumber B16;

+    CARD32	authId B32;

+    CARD32	pad0	 B32;

+    CARD32	pad1	 B32;

+    CARD32	pad2	 B32;

+    CARD32	pad3	 B32;

+    CARD32	pad4	 B32;

+    CARD32	pad5	 B32;

+} xSecurityAuthorizationRevokedEvent;

+#define sz_xSecurityAuthorizationRevokedEvent 32

+

+#endif /* _SECURPROTO_H */