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

diff --git a/libX11/src/StColors.c b/libX11/src/StColors.c
index 17a215cc0..d281f6965 100644
--- a/libX11/src/StColors.c
+++ b/libX11/src/StColors.c
@@ -1,65 +1,65 @@
-/*
-
-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"
-
-int
-XStoreColors(
-    register Display *dpy,
-    Colormap cmap,
-    XColor *defs,
-    int ncolors)
-{
-    register int i;
-    xColorItem citem;
-    register xStoreColorsReq *req;
-
-    LockDisplay(dpy);
-    GetReq(StoreColors, req);
-
-    req->cmap = cmap;
-
-    req->length += (ncolors * SIZEOF(xColorItem)) >> 2; /* assume size is 4*n */
-
-    for (i = 0; i < ncolors; i++) {
-	citem.pixel = defs[i].pixel;
-	citem.red = defs[i].red;
-	citem.green = defs[i].green;
-	citem.blue = defs[i].blue;
-	citem.flags = defs[i].flags;
-
-	/* note that xColorItem doesn't contain all 16-bit quantities, so
-	   we can't use Data16 */
-	Data(dpy, (char *)&citem, (long) SIZEOF(xColorItem));
-			/* assume size is 4*n */
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
+/*

+

+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"

+

+int

+XStoreColors(

+    register Display *dpy,

+    Colormap cmap,

+    XColor *defs,

+    int ncolors)

+{

+    register int i;

+    xColorItem citem;

+    register xStoreColorsReq *req;

+

+    LockDisplay(dpy);

+    GetReq(StoreColors, req);

+

+    req->cmap = cmap;

+

+    req->length += (ncolors * SIZEOF(xColorItem)) >> 2; /* assume size is 4*n */

+

+    for (i = 0; i < ncolors; i++) {

+	citem.pixel = defs[i].pixel;

+	citem.red = defs[i].red;

+	citem.green = defs[i].green;

+	citem.blue = defs[i].blue;

+	citem.flags = defs[i].flags;

+

+	/* note that xColorItem doesn't contain all 16-bit quantities, so

+	   we can't use Data16 */

+	Data(dpy, (char *)&citem, (long) SIZEOF(xColorItem));

+			/* assume size is 4*n */

+    }

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return 1;

+}