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

diff --git a/libX11/src/evtomask.c b/libX11/src/evtomask.c
index b108d2a88..fde80b440 100644
--- a/libX11/src/evtomask.c
+++ b/libX11/src/evtomask.c
@@ -1,74 +1,74 @@
-/*
-
-Copyright 1987, 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.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/X.h>
-
-/*
- * This array can be used given an event type to determine the mask bits
- * that could have generated it.
- */
-long const _Xevent_to_mask [LASTEvent] = {
-	0,						/* no event 0 */
-	0,						/* no event 1 */
-	KeyPressMask,					/* KeyPress */
-	KeyReleaseMask,					/* KeyRelease */
-	ButtonPressMask,				/* ButtonPress */
-	ButtonReleaseMask,				/* ButtonRelease */
-	PointerMotionMask|PointerMotionHintMask|Button1MotionMask|
-		Button2MotionMask|Button3MotionMask|Button4MotionMask|
-		Button5MotionMask|ButtonMotionMask,	/* MotionNotify */
-	EnterWindowMask,				/* EnterNotify */
-	LeaveWindowMask,				/* LeaveNotify */
-	FocusChangeMask,				/* FocusIn */
-	FocusChangeMask,				/* FocusOut */
-	KeymapStateMask,				/* KeymapNotify */
-	ExposureMask,					/* Expose */
-	ExposureMask,					/* GraphicsExpose */
-	ExposureMask,					/* NoExpose */
-	VisibilityChangeMask,				/* VisibilityNotify */
-	SubstructureNotifyMask,				/* CreateNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* DestroyNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* UnmapNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* MapNotify */
-	SubstructureRedirectMask,			/* MapRequest */
-	SubstructureNotifyMask|StructureNotifyMask,	/* ReparentNotify */
-	StructureNotifyMask|SubstructureNotifyMask,	/* ConfigureNotify */
-	SubstructureRedirectMask,			/* ConfigureRequest */
-	SubstructureNotifyMask|StructureNotifyMask,	/* GravityNotify */
-	ResizeRedirectMask,				/* ResizeRequest */
-	SubstructureNotifyMask|StructureNotifyMask,	/* CirculateNotify */
-	SubstructureRedirectMask,			/* CirculateRequest */
-	PropertyChangeMask,				/* PropertyNotify */
-	0,						/* SelectionClear */
-	0,						/* SelectionRequest */
-	0,						/* SelectionNotify */
-	ColormapChangeMask,				/* ColormapNotify */
-	0,						/* ClientMessage */
-	0,						/* MappingNotify */
-};
+/*

+

+Copyright 1987, 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.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/X.h>

+

+/*

+ * This array can be used given an event type to determine the mask bits

+ * that could have generated it.

+ */

+long const _Xevent_to_mask [LASTEvent] = {

+	0,						/* no event 0 */

+	0,						/* no event 1 */

+	KeyPressMask,					/* KeyPress */

+	KeyReleaseMask,					/* KeyRelease */

+	ButtonPressMask,				/* ButtonPress */

+	ButtonReleaseMask,				/* ButtonRelease */

+	PointerMotionMask|PointerMotionHintMask|Button1MotionMask|

+		Button2MotionMask|Button3MotionMask|Button4MotionMask|

+		Button5MotionMask|ButtonMotionMask,	/* MotionNotify */

+	EnterWindowMask,				/* EnterNotify */

+	LeaveWindowMask,				/* LeaveNotify */

+	FocusChangeMask,				/* FocusIn */

+	FocusChangeMask,				/* FocusOut */

+	KeymapStateMask,				/* KeymapNotify */

+	ExposureMask,					/* Expose */

+	ExposureMask,					/* GraphicsExpose */

+	ExposureMask,					/* NoExpose */

+	VisibilityChangeMask,				/* VisibilityNotify */

+	SubstructureNotifyMask,				/* CreateNotify */

+	StructureNotifyMask|SubstructureNotifyMask,	/* DestroyNotify */

+	StructureNotifyMask|SubstructureNotifyMask,	/* UnmapNotify */

+	StructureNotifyMask|SubstructureNotifyMask,	/* MapNotify */

+	SubstructureRedirectMask,			/* MapRequest */

+	SubstructureNotifyMask|StructureNotifyMask,	/* ReparentNotify */

+	StructureNotifyMask|SubstructureNotifyMask,	/* ConfigureNotify */

+	SubstructureRedirectMask,			/* ConfigureRequest */

+	SubstructureNotifyMask|StructureNotifyMask,	/* GravityNotify */

+	ResizeRedirectMask,				/* ResizeRequest */

+	SubstructureNotifyMask|StructureNotifyMask,	/* CirculateNotify */

+	SubstructureRedirectMask,			/* CirculateRequest */

+	PropertyChangeMask,				/* PropertyNotify */

+	0,						/* SelectionClear */

+	0,						/* SelectionRequest */

+	0,						/* SelectionNotify */

+	ColormapChangeMask,				/* ColormapNotify */

+	0,						/* ClientMessage */

+	0,						/* MappingNotify */

+};