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

diff --git a/libX11/src/FetchName.c b/libX11/src/FetchName.c
index 22bd4607a..4363a01cb 100644
--- a/libX11/src/FetchName.c
+++ b/libX11/src/FetchName.c
@@ -1,95 +1,95 @@
-/*
-
-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 <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <stdio.h>
-
-
-Status XFetchName (
-    register Display *dpy,
-    Window w,
-    char **name)
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    unsigned char *data = NULL;
-    if (XGetWindowProperty(dpy, w, XA_WM_NAME, 0L, (long)BUFSIZ, False, XA_STRING,
-	&actual_type,
-	&actual_format, &nitems, &leftover, &data) != Success) {
-        *name = NULL;
-	return (0);
-	}
-    if ( (actual_type == XA_STRING) &&  (actual_format == 8) ) {
-
-	/* The data returned by XGetWindowProperty is guarranteed to
-	contain one extra byte that is null terminated to make retrieveing
-	string properties easy. */
-
-	*name = (char *)data;
-	return(1);
-	}
-    if (data) Xfree ((char *)data);
-    *name = NULL;
-    return(0);
-}
-
-Status XGetIconName (
-    register Display *dpy,
-    Window w,
-    char **icon_name)
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    unsigned char *data = NULL;
-    if (XGetWindowProperty(dpy, w, XA_WM_ICON_NAME, 0L, (long)BUFSIZ, False,
-        XA_STRING,
-	&actual_type,
-	&actual_format, &nitems, &leftover, &data) != Success) {
-        *icon_name = NULL;
-	return (0);
-	}
-    if ( (actual_type == XA_STRING) &&  (actual_format == 8) ) {
-
-	/* The data returned by XGetWindowProperty is guarranteed to
-	contain one extra byte that is null terminated to make retrieveing
-	string properties easy. */
-
-	*icon_name = (char*)data;
-	return(1);
-	}
-    if (data) Xfree ((char *)data);
-    *icon_name = NULL;
-    return(0);
-}
+/*

+

+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 <X11/Xlibint.h>

+#include <X11/Xatom.h>

+#include <X11/Xos.h>

+#include <stdio.h>

+

+

+Status XFetchName (

+    register Display *dpy,

+    Window w,

+    char **name)

+{

+    Atom actual_type;

+    int actual_format;

+    unsigned long nitems;

+    unsigned long leftover;

+    unsigned char *data = NULL;

+    if (XGetWindowProperty(dpy, w, XA_WM_NAME, 0L, (long)BUFSIZ, False, XA_STRING,

+	&actual_type,

+	&actual_format, &nitems, &leftover, &data) != Success) {

+        *name = NULL;

+	return (0);

+	}

+    if ( (actual_type == XA_STRING) &&  (actual_format == 8) ) {

+

+	/* The data returned by XGetWindowProperty is guarranteed to

+	contain one extra byte that is null terminated to make retrieveing

+	string properties easy. */

+

+	*name = (char *)data;

+	return(1);

+	}

+    if (data) Xfree ((char *)data);

+    *name = NULL;

+    return(0);

+}

+

+Status XGetIconName (

+    register Display *dpy,

+    Window w,

+    char **icon_name)

+{

+    Atom actual_type;

+    int actual_format;

+    unsigned long nitems;

+    unsigned long leftover;

+    unsigned char *data = NULL;

+    if (XGetWindowProperty(dpy, w, XA_WM_ICON_NAME, 0L, (long)BUFSIZ, False,

+        XA_STRING,

+	&actual_type,

+	&actual_format, &nitems, &leftover, &data) != Success) {

+        *icon_name = NULL;

+	return (0);

+	}

+    if ( (actual_type == XA_STRING) &&  (actual_format == 8) ) {

+

+	/* The data returned by XGetWindowProperty is guarranteed to

+	contain one extra byte that is null terminated to make retrieveing

+	string properties easy. */

+

+	*icon_name = (char*)data;

+	return(1);

+	}

+    if (data) Xfree ((char *)data);

+    *icon_name = NULL;

+    return(0);

+}