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

diff --git a/libX11/src/xlibi18n/wcWrap.c b/libX11/src/xlibi18n/wcWrap.c
index cc3b33f7d..de1011f64 100644
--- a/libX11/src/xlibi18n/wcWrap.c
+++ b/libX11/src/xlibi18n/wcWrap.c
@@ -1,161 +1,161 @@
-/*
-
-Copyright 1991, 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.
-
-*/
-
-/*
- * Copyright 1991 by the Open Software Foundation
- *
- * 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, and that the name of Open Software Foundation
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Open Software
- * Foundation makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *		 M. Collins		OSF
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-void
-XwcDrawText(
-    Display            *dpy,
-    Drawable            d,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    XwcTextItem        *text_items,
-    int                 nitems)
-{
-    register XFontSet fs = NULL;
-    register XwcTextItem *p = text_items;
-    register int i = nitems;
-    register int esc;
-
-    /* ignore leading items with no fontset */
-    while (i && !p->font_set) {
-	i--;
-	p++;
-    }
-
-    for (; --i >= 0; p++) {
-	if (p->font_set)
-	    fs = p->font_set;
-	x += p->delta;
-	esc = (*fs->methods->wc_draw_string) (dpy, d, fs, gc, x, y,
-					      p->chars, p->nchars);
-	if (!esc)
-	    esc = fs->methods->wc_escapement (fs, p->chars, p->nchars);
-	x += esc;
-    }
-}
-
-void
-XwcDrawString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst wchar_t    *text,
-    int                 text_len)
-{
-    (void)(*font_set->methods->wc_draw_string) (dpy, d, font_set, gc, x, y,
-						text, text_len);
-}
-
-void
-XwcDrawImageString(
-    Display            *dpy,
-    Drawable            d,
-    XFontSet            font_set,
-    GC                  gc,
-    int                 x,
-    int                 y,
-    _Xconst wchar_t    *text,
-    int                 text_len)
-{
-    (*font_set->methods->wc_draw_image_string) (dpy, d, font_set, gc, x, y,
-						text, text_len);
-}
-
-int
-XwcTextEscapement(
-    XFontSet            font_set,
-    _Xconst wchar_t    *text,
-    int                 text_len)
-{
-    return (*font_set->methods->wc_escapement) (font_set, text, text_len);
-}
-
-int
-XwcTextExtents(
-    XFontSet            font_set,
-    _Xconst wchar_t    *text,
-    int                 text_len,
-    XRectangle         *overall_ink_extents,
-    XRectangle         *overall_logical_extents)
-{
-    return (*font_set->methods->wc_extents) (font_set, text, text_len,
-					     overall_ink_extents,
-					     overall_logical_extents);
-}
-
-Status
-XwcTextPerCharExtents(
-    XFontSet            font_set,
-    _Xconst wchar_t    *text,
-    int                 text_len,
-    XRectangle         *ink_extents_buffer,
-    XRectangle         *logical_extents_buffer,
-    int                 buffer_size,
-    int                *num_chars,
-    XRectangle         *max_ink_extents,
-    XRectangle         *max_logical_extents)
-{
-    return (*font_set->methods->wc_extents_per_char)
-	      (font_set, text, text_len,
-	       ink_extents_buffer, logical_extents_buffer,
-	       buffer_size, num_chars, max_ink_extents, max_logical_extents);
-}
+/*

+

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

+

+*/

+

+/*

+ * Copyright 1991 by the Open Software Foundation

+ *

+ * 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, and that the name of Open Software Foundation

+ * not be used in advertising or publicity pertaining to distribution of the

+ * software without specific, written prior permission.  Open Software

+ * Foundation makes no representations about the suitability of this

+ * software for any purpose.  It is provided "as is" without express or

+ * implied warranty.

+ *

+ * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO

+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+ * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE

+ * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ *

+ *		 M. Collins		OSF

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+#include "Xlcint.h"

+

+void

+XwcDrawText(

+    Display            *dpy,

+    Drawable            d,

+    GC                  gc,

+    int                 x,

+    int                 y,

+    XwcTextItem        *text_items,

+    int                 nitems)

+{

+    register XFontSet fs = NULL;

+    register XwcTextItem *p = text_items;

+    register int i = nitems;

+    register int esc;

+

+    /* ignore leading items with no fontset */

+    while (i && !p->font_set) {

+	i--;

+	p++;

+    }

+

+    for (; --i >= 0; p++) {

+	if (p->font_set)

+	    fs = p->font_set;

+	x += p->delta;

+	esc = (*fs->methods->wc_draw_string) (dpy, d, fs, gc, x, y,

+					      p->chars, p->nchars);

+	if (!esc)

+	    esc = fs->methods->wc_escapement (fs, p->chars, p->nchars);

+	x += esc;

+    }

+}

+

+void

+XwcDrawString(

+    Display            *dpy,

+    Drawable            d,

+    XFontSet            font_set,

+    GC                  gc,

+    int                 x,

+    int                 y,

+    _Xconst wchar_t    *text,

+    int                 text_len)

+{

+    (void)(*font_set->methods->wc_draw_string) (dpy, d, font_set, gc, x, y,

+						text, text_len);

+}

+

+void

+XwcDrawImageString(

+    Display            *dpy,

+    Drawable            d,

+    XFontSet            font_set,

+    GC                  gc,

+    int                 x,

+    int                 y,

+    _Xconst wchar_t    *text,

+    int                 text_len)

+{

+    (*font_set->methods->wc_draw_image_string) (dpy, d, font_set, gc, x, y,

+						text, text_len);

+}

+

+int

+XwcTextEscapement(

+    XFontSet            font_set,

+    _Xconst wchar_t    *text,

+    int                 text_len)

+{

+    return (*font_set->methods->wc_escapement) (font_set, text, text_len);

+}

+

+int

+XwcTextExtents(

+    XFontSet            font_set,

+    _Xconst wchar_t    *text,

+    int                 text_len,

+    XRectangle         *overall_ink_extents,

+    XRectangle         *overall_logical_extents)

+{

+    return (*font_set->methods->wc_extents) (font_set, text, text_len,

+					     overall_ink_extents,

+					     overall_logical_extents);

+}

+

+Status

+XwcTextPerCharExtents(

+    XFontSet            font_set,

+    _Xconst wchar_t    *text,

+    int                 text_len,

+    XRectangle         *ink_extents_buffer,

+    XRectangle         *logical_extents_buffer,

+    int                 buffer_size,

+    int                *num_chars,

+    XRectangle         *max_ink_extents,

+    XRectangle         *max_logical_extents)

+{

+    return (*font_set->methods->wc_extents_per_char)

+	      (font_set, text, text_len,

+	       ink_extents_buffer, logical_extents_buffer,

+	       buffer_size, num_chars, max_ink_extents, max_logical_extents);

+}