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

diff --git a/libX11/src/CrWindow.c b/libX11/src/CrWindow.c
index 347e9a022..bb5dfc50e 100644
--- a/libX11/src/CrWindow.c
+++ b/libX11/src/CrWindow.c
@@ -1,82 +1,82 @@
-/*
-
-Copyright 1986, 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 "Xlibint.h"
-
-#ifdef _MSC_VER
-#undef CreateWindow
-#endif
-
-Window XCreateSimpleWindow(
-    register Display *dpy,
-    Window parent,
-    int x,
-    int y,
-    unsigned int width,
-    unsigned int height,
-    unsigned int borderWidth,
-    unsigned long border,
-    unsigned long background)
-{
-    Window wid;
-    register xCreateWindowReq *req;
-
-    LockDisplay(dpy);
-    GetReqExtra(CreateWindow, 8, req);
-    req->parent = parent;
-    req->x = x;
-    req->y = y;
-    req->width = width;
-    req->height = height;
-    req->borderWidth = borderWidth;
-    req->depth = 0;
-    req->class = CopyFromParent;
-    req->visual = CopyFromParent;
-    wid = req->wid = XAllocID(dpy);
-    req->mask = CWBackPixel | CWBorderPixel;
-
-#ifdef MUSTCOPY
-    {
-	unsigned long lbackground = background, lborder = border;
-	dpy->bufptr -= 8;
-	Data32 (dpy, (long *) &lbackground, 4);
-	Data32 (dpy, (long *) &lborder, 4);
-    }
-#else
-    {
-	register CARD32 *valuePtr = (CARD32 *) NEXTPTR(req,xCreateWindowReq);
-	*valuePtr++ = background;
-	*valuePtr = border;
-    }
-#endif /* MUSTCOPY */
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (wid);
-    }
+/*

+

+Copyright 1986, 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 "Xlibint.h"

+

+#ifdef _MSC_VER

+#undef CreateWindow

+#endif

+

+Window XCreateSimpleWindow(

+    register Display *dpy,

+    Window parent,

+    int x,

+    int y,

+    unsigned int width,

+    unsigned int height,

+    unsigned int borderWidth,

+    unsigned long border,

+    unsigned long background)

+{

+    Window wid;

+    register xCreateWindowReq *req;

+

+    LockDisplay(dpy);

+    GetReqExtra(CreateWindow, 8, req);

+    req->parent = parent;

+    req->x = x;

+    req->y = y;

+    req->width = width;

+    req->height = height;

+    req->borderWidth = borderWidth;

+    req->depth = 0;

+    req->class = CopyFromParent;

+    req->visual = CopyFromParent;

+    wid = req->wid = XAllocID(dpy);

+    req->mask = CWBackPixel | CWBorderPixel;

+

+#ifdef MUSTCOPY

+    {

+	unsigned long lbackground = background, lborder = border;

+	dpy->bufptr -= 8;

+	Data32 (dpy, (long *) &lbackground, 4);

+	Data32 (dpy, (long *) &lborder, 4);

+    }

+#else

+    {

+	register CARD32 *valuePtr = (CARD32 *) NEXTPTR(req,xCreateWindowReq);

+	*valuePtr++ = background;

+	*valuePtr = border;

+    }

+#endif /* MUSTCOPY */

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return (wid);

+    }