Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	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/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 110 insertions, 110 deletions

diff --git a/libX11/src/GCMisc.c b/libX11/src/GCMisc.c
index 26f894817..751e27dca 100644
--- a/libX11/src/GCMisc.c
+++ b/libX11/src/GCMisc.c
@@ -1,110 +1,110 @@
-/*

-

-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

-XSetArcMode (

-    register Display *dpy,

-    register GC gc,

-    int arc_mode)

-{

-    LockDisplay(dpy);

-    if (gc->values.arc_mode != arc_mode) {

-	gc->values.arc_mode = arc_mode;

-	gc->dirty |= GCArcMode;

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return 1;

-}

-

-int

-XSetFillRule (

-    register Display *dpy,

-    register GC gc,

-    int fill_rule)

-{

-    LockDisplay(dpy);

-    if (gc->values.fill_rule != fill_rule) {

-	gc->values.fill_rule = fill_rule;

-	gc->dirty |= GCFillRule;

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return 1;

-}

-

-int

-XSetFillStyle (

-    register Display *dpy,

-    register GC gc,

-    int fill_style)

-{

-    LockDisplay(dpy);

-    if (gc->values.fill_style != fill_style) {

-	gc->values.fill_style = fill_style;

-	gc->dirty |= GCFillStyle;

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return 1;

-}

-

-int

-XSetGraphicsExposures (

-    register Display *dpy,

-    register GC gc,

-    Bool graphics_exposures)

-{

-    LockDisplay(dpy);

-    if (gc->values.graphics_exposures != graphics_exposures) {

-	gc->values.graphics_exposures = graphics_exposures;

-	gc->dirty |= GCGraphicsExposures;

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return 1;

-}

-

-int

-XSetSubwindowMode (

-    register Display *dpy,

-    register GC gc,

-    int subwindow_mode)

-{

-    LockDisplay(dpy);

-    if (gc->values.subwindow_mode != subwindow_mode) {

-	gc->values.subwindow_mode = subwindow_mode;

-	gc->dirty |= GCSubwindowMode;

-    }

-    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
+XSetArcMode (
+    register Display *dpy,
+    register GC gc,
+    int arc_mode)
+{
+    LockDisplay(dpy);
+    if (gc->values.arc_mode != arc_mode) {
+	gc->values.arc_mode = arc_mode;
+	gc->dirty |= GCArcMode;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 1;
+}
+
+int
+XSetFillRule (
+    register Display *dpy,
+    register GC gc,
+    int fill_rule)
+{
+    LockDisplay(dpy);
+    if (gc->values.fill_rule != fill_rule) {
+	gc->values.fill_rule = fill_rule;
+	gc->dirty |= GCFillRule;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 1;
+}
+
+int
+XSetFillStyle (
+    register Display *dpy,
+    register GC gc,
+    int fill_style)
+{
+    LockDisplay(dpy);
+    if (gc->values.fill_style != fill_style) {
+	gc->values.fill_style = fill_style;
+	gc->dirty |= GCFillStyle;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 1;
+}
+
+int
+XSetGraphicsExposures (
+    register Display *dpy,
+    register GC gc,
+    Bool graphics_exposures)
+{
+    LockDisplay(dpy);
+    if (gc->values.graphics_exposures != graphics_exposures) {
+	gc->values.graphics_exposures = graphics_exposures;
+	gc->dirty |= GCGraphicsExposures;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 1;
+}
+
+int
+XSetSubwindowMode (
+    register Display *dpy,
+    register GC gc,
+    int subwindow_mode)
+{
+    LockDisplay(dpy);
+    if (gc->values.subwindow_mode != subwindow_mode) {
+	gc->values.subwindow_mode = subwindow_mode;
+	gc->dirty |= GCSubwindowMode;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 1;
+}