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

3 files changed, 112 insertions, 112 deletions

diff --git a/xorg-server/hw/dmx/input/Makefile.am b/xorg-server/hw/dmx/input/Makefile.am
index 185aaf84e..ebe9a0843 100644
--- a/xorg-server/hw/dmx/input/Makefile.am
+++ b/xorg-server/hw/dmx/input/Makefile.am
@@ -1,67 +1,67 @@
-noinst_LIBRARIES = libdmxinput.a
-
-if DMX_BUILD_LNX
-RAWSRCS = lnx-keyboard.c \
-          lnx-keyboard.h \
-          lnx-ms.c \
-          lnx-ms.h \
-          lnx-ps2.c \
-          lnx-ps2.h
-endif
-
-if DMX_BUILD_USB
-USBSRCS = usb-keyboard.c \
-          usb-keyboard.h \
-          usb-mouse.c \
-          usb-mouse.h \
-          usb-other.c \
-          usb-other.h \
-          usb-common.c \
-          usb-common.h \
-          usb-private.h
-endif
-
-DRVSRCS = dmxdummy.c \
-          dmxdummy.h \
-          dmxbackend.c \
-          dmxbackend.h \
-          dmxconsole.c \
-          dmxconsole.h \
-          dmxcommon.c \
-          dmxcommon.h
-
-DMXSRCS = dmxinputinit.c \
-          dmxinputinit.h \
-          dmxarg.c \
-          dmxarg.h \
-          dmxsigio.c \
-          dmxsigio.h \
-          dmxevents.c \
-          dmxevents.h \
-	  dmxxinput.c \
-          dmxmotion.c \
-          dmxmotion.h \
-          dmxmap.c \
-          dmxmap.h
-
-
-libdmxinput_a_SOURCES = ChkNotMaskEv.c \
-                        ChkNotMaskEv.h \
-                        atKeynames.h \
-                        $(RAWSRCS) \
-                        $(USBSRCS) \
-                        $(DRVSRCS) \
-                        $(DMXSRCS) \
-                        $(LIBSRCS)
-
-if GLX
-GLX_DEFS = @GL_CFLAGS@
-endif	    
-
-AM_CFLAGS = $(DIX_CFLAGS) \
-            -I$(top_srcdir)/hw/dmx \
-            -DHAVE_DMX_CONFIG_H \
-            $(GLX_DEFS) \
-            @DMXMODULES_CFLAGS@
-
-EXTRA_DIST = dmxdetach.c
+noinst_LIBRARIES = libdmxinput.a

+

+if DMX_BUILD_LNX

+RAWSRCS = lnx-keyboard.c \

+          lnx-keyboard.h \

+          lnx-ms.c \

+          lnx-ms.h \

+          lnx-ps2.c \

+          lnx-ps2.h

+endif

+

+if DMX_BUILD_USB

+USBSRCS = usb-keyboard.c \

+          usb-keyboard.h \

+          usb-mouse.c \

+          usb-mouse.h \

+          usb-other.c \

+          usb-other.h \

+          usb-common.c \

+          usb-common.h \

+          usb-private.h

+endif

+

+DRVSRCS = dmxdummy.c \

+          dmxdummy.h \

+          dmxbackend.c \

+          dmxbackend.h \

+          dmxconsole.c \

+          dmxconsole.h \

+          dmxcommon.c \

+          dmxcommon.h

+

+DMXSRCS = dmxinputinit.c \

+          dmxinputinit.h \

+          dmxarg.c \

+          dmxarg.h \

+          dmxsigio.c \

+          dmxsigio.h \

+          dmxevents.c \

+          dmxevents.h \

+	  dmxxinput.c \

+          dmxmotion.c \

+          dmxmotion.h \

+          dmxmap.c \

+          dmxmap.h

+

+

+libdmxinput_a_SOURCES = ChkNotMaskEv.c \

+                        ChkNotMaskEv.h \

+                        atKeynames.h \

+                        $(RAWSRCS) \

+                        $(USBSRCS) \

+                        $(DRVSRCS) \

+                        $(DMXSRCS) \

+                        $(LIBSRCS)

+

+if GLX

+GLX_DEFS = @GL_CFLAGS@

+endif	    

+

+AM_CFLAGS = $(DIX_CFLAGS) \

+            -I$(top_srcdir)/hw/dmx \

+            -DHAVE_DMX_CONFIG_H \

+            $(GLX_DEFS) \

+            @DMXMODULES_CFLAGS@

+

+EXTRA_DIST = dmxdetach.c

diff --git a/xorg-server/hw/dmx/input/dmxconsole.c b/xorg-server/hw/dmx/input/dmxconsole.c
index f63772b17..600a70553 100644
--- a/xorg-server/hw/dmx/input/dmxconsole.c
+++ b/xorg-server/hw/dmx/input/dmxconsole.c
@@ -640,7 +640,7 @@ dmxCloseConsole(myPrivate * priv)
 }
 
 static Bool
-dmxCloseConsoleScreen(int idx, ScreenPtr pScreen)
+dmxCloseConsoleScreen(ScreenPtr pScreen)
 {
     myPrivate *priv, *last;
 
@@ -650,7 +650,7 @@ dmxCloseConsoleScreen(int idx, ScreenPtr pScreen)
         dmxCloseConsole(last = priv);
 
     DMX_UNWRAP(CloseScreen, last, pScreen);
-    return pScreen->CloseScreen(idx, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 static Cursor
diff --git a/xorg-server/hw/dmx/input/dmxdummy.h b/xorg-server/hw/dmx/input/dmxdummy.h
index e3a85be95..17318b4d9 100644
--- a/xorg-server/hw/dmx/input/dmxdummy.h
+++ b/xorg-server/hw/dmx/input/dmxdummy.h
@@ -1,43 +1,43 @@
-/*
- * Copyright 2002 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) 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
- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * 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.
- */
-
-/*
- * Authors:
- *   Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-/** \file
- * Interface to dummy input device support.  \see dmxdummy.c */
-
-#ifndef _DMXDUMMY_H_
-#define _DMXDUMMY_H_
-
-extern void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-extern void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-
-#endif
+/*

+ * Copyright 2002 Red Hat Inc., Durham, North Carolina.

+ *

+ * All Rights Reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining

+ * a copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation on the rights to use, copy, modify, merge,

+ * publish, distribute, sublicense, and/or sell copies of the Software,

+ * and to permit persons to whom the Software is furnished to do so,

+ * subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the

+ * next paragraph) 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

+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

+ * 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.

+ */

+

+/*

+ * Authors:

+ *   Rickard E. (Rik) Faith <faith@redhat.com>

+ *

+ */

+

+/** \file

+ * Interface to dummy input device support.  \see dmxdummy.c */

+

+#ifndef _DMXDUMMY_H_

+#define _DMXDUMMY_H_

+

+extern void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);

+extern void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);

+

+#endif