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

7 files changed, 134 insertions, 134 deletions

diff --git a/xorg-server/hw/xquartz/bundle/.gitignore b/xorg-server/hw/xquartz/bundle/.gitignore
index fbdbd09cd..4e432c232 100644
--- a/xorg-server/hw/xquartz/bundle/.gitignore
+++ b/xorg-server/hw/xquartz/bundle/.gitignore
@@ -1 +1 @@
-Info.plist

+Info.plist
diff --git a/xorg-server/hw/xquartz/bundle/X11.sh b/xorg-server/hw/xquartz/bundle/X11.sh
index 48c0553d1..3b8b6799c 100644
--- a/xorg-server/hw/xquartz/bundle/X11.sh
+++ b/xorg-server/hw/xquartz/bundle/X11.sh
@@ -1,15 +1,15 @@
-#!/bin/bash

-

-set "$(dirname "$0")"/X11.bin "${@}"

-

-if [ -x ~/.x11run ]; then

-	exec ~/.x11run "${@}"

-fi

-

-case $(basename "${SHELL}") in

-	bash)          exec -l "${SHELL}" --login -c 'exec "${@}"' - "${@}" ;;

-	ksh|sh|zsh)    exec -l "${SHELL}" -c 'exec "${@}"' - "${@}" ;;

-	csh|tcsh)      exec -l "${SHELL}" -c 'exec $argv:q' "${@}" ;;

-	es|rc)         exec -l "${SHELL}" -l -c 'exec $*' "${@}" ;;

-	*)             exec    "${@}" ;;

-esac

+#!/bin/bash
+
+set "$(dirname "$0")"/X11.bin "${@}"
+
+if [ -x ~/.x11run ]; then
+	exec ~/.x11run "${@}"
+fi
+
+case $(basename "${SHELL}") in
+	bash)          exec -l "${SHELL}" --login -c 'exec "${@}"' - "${@}" ;;
+	ksh|sh|zsh)    exec -l "${SHELL}" -c 'exec "${@}"' - "${@}" ;;
+	csh|tcsh)      exec -l "${SHELL}" -c 'exec $argv:q' "${@}" ;;
+	es|rc)         exec -l "${SHELL}" -l -c 'exec $*' "${@}" ;;
+	*)             exec    "${@}" ;;
+esac
diff --git a/xorg-server/hw/xquartz/bundle/Xquartz.plist b/xorg-server/hw/xquartz/bundle/Xquartz.plist
index 3ee787807..e15704516 100644
--- a/xorg-server/hw/xquartz/bundle/Xquartz.plist
+++ b/xorg-server/hw/xquartz/bundle/Xquartz.plist
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-

-<!-- This file contains system-wide defaults for the Apple X11 server -->

-

-<plist version="1.0">

-<dict>

-	<key>apps_menu</key>

-	<array>

-		<array>

-			<string>Terminal</string>

-			<string>xterm</string>

-			<string>n</string>

-		</array>

-		<array>

-			<string>xman</string>

-			<string>xman</string>

-			<string></string>

-		</array>

-		<array>

-			<string>xlogo</string>

-			<string>xlogo</string>

-			<string></string>

-		</array>

-	</array>

-</dict>

-</plist>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
+<!-- This file contains system-wide defaults for the Apple X11 server -->
+
+<plist version="1.0">
+<dict>
+	<key>apps_menu</key>
+	<array>
+		<array>
+			<string>Terminal</string>
+			<string>xterm</string>
+			<string>n</string>
+		</array>
+		<array>
+			<string>xman</string>
+			<string>xman</string>
+			<string></string>
+		</array>
+		<array>
+			<string>xlogo</string>
+			<string>xlogo</string>
+			<string></string>
+		</array>
+	</array>
+</dict>
+</plist>
diff --git a/xorg-server/hw/xquartz/mach-startup/.gitignore b/xorg-server/hw/xquartz/mach-startup/.gitignore
index 0bda6e75c..374abbfbe 100644
--- a/xorg-server/hw/xquartz/mach-startup/.gitignore
+++ b/xorg-server/hw/xquartz/mach-startup/.gitignore
@@ -1,8 +1,8 @@
-#		Add & Override for this directory and it's subdirectories

-mach_startup.h

-mach_startupServer.c

-mach_startupServer.h

-mach_startupUser.c

-X11.bin

-Xquartz

-

+#		Add & Override for this directory and it's subdirectories
+mach_startup.h
+mach_startupServer.c
+mach_startupServer.h
+mach_startupUser.c
+X11.bin
+Xquartz
+
diff --git a/xorg-server/hw/xquartz/mach-startup/mach_startup.defs b/xorg-server/hw/xquartz/mach-startup/mach_startup.defs
index 7b575bf54..e47f49c3c 100644
--- a/xorg-server/hw/xquartz/mach-startup/mach_startup.defs
+++ b/xorg-server/hw/xquartz/mach-startup/mach_startup.defs
@@ -1,50 +1,50 @@
-/* Copyright (c) 2008 Apple Inc.

- *

- * 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 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 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 ABOVE LISTED COPYRIGHT

- * HOLDER(S) 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(s) of the above

- * copyright holders shall not be used in advertising or otherwise to

- * promote the sale, use or other dealings in this Software without

- * prior written authorization.

- */

-

-#include <mach/std_types.defs>

-#include <mach/mach_types.defs>

-import "mach_startup_types.h";

-

-subsystem mach_startup 1000;

-serverprefix do_;

-

-type string_t = c_string[1024];

-type string_array_t = array[] of string_t;

-

-routine start_x11_server(

-    port  : mach_port_t;

-    argv  : string_array_t;

-    envp  : string_array_t);

-

-routine request_fd_handoff_socket (

-        port             : mach_port_t;

-    out socket_filename  : string_t);

-

-routine request_pid (

-        port    : mach_port_t;

-    out pid     : int);

+/* Copyright (c) 2008 Apple Inc.
+ *
+ * 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 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 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) 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(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+import "mach_startup_types.h";
+
+subsystem mach_startup 1000;
+serverprefix do_;
+
+type string_t = c_string[1024];
+type string_array_t = array[] of string_t;
+
+routine start_x11_server(
+    port  : mach_port_t;
+    argv  : string_array_t;
+    envp  : string_array_t);
+
+routine request_fd_handoff_socket (
+        port             : mach_port_t;
+    out socket_filename  : string_t);
+
+routine request_pid (
+        port    : mach_port_t;
+    out pid     : int);
diff --git a/xorg-server/hw/xquartz/pbproxy/.gitignore b/xorg-server/hw/xquartz/pbproxy/.gitignore
index d6e6710f2..6684920ff 100644
--- a/xorg-server/hw/xquartz/pbproxy/.gitignore
+++ b/xorg-server/hw/xquartz/pbproxy/.gitignore
@@ -1 +1 @@
-xpbproxy

+xpbproxy
diff --git a/xorg-server/hw/xquartz/xpr/Makefile.am b/xorg-server/hw/xquartz/xpr/Makefile.am
index 685052702..763a7cd5c 100644
--- a/xorg-server/hw/xquartz/xpr/Makefile.am
+++ b/xorg-server/hw/xquartz/xpr/Makefile.am
@@ -1,32 +1,32 @@
-noinst_LTLIBRARIES = libXquartzXpr.la

-

-AM_CFLAGS =  $(DIX_CFLAGS)

-AM_CPPFLAGS = \

-	-I$(srcdir) -I$(srcdir)/.. \

-	-I$(top_srcdir)/miext \

-	-I$(top_srcdir)/miext/rootless

-

-libXquartzXpr_la_SOURCES = \

-	appledri.c \

-	dri.c \

-	driWrap.c \

-	xprAppleWM.c \

-	xprCursor.c \

-	xprEvent.c \

-	xprFrame.c \

-	xprScreen.c \

-	x-hash.c \

-	x-hook.c \

-	x-list.c

-

-EXTRA_DIST = \

-	dri.h \

-	driWrap.h \

-	dristruct.h \

-	appledri.h \

-	appledristr.h \

-	x-hash.h \

-	x-hook.h \

-	x-list.h \

-	xpr.h \

-	xprEvent.h

+noinst_LTLIBRARIES = libXquartzXpr.la
+
+AM_CFLAGS =  $(DIX_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(srcdir) -I$(srcdir)/.. \
+	-I$(top_srcdir)/miext \
+	-I$(top_srcdir)/miext/rootless
+
+libXquartzXpr_la_SOURCES = \
+	appledri.c \
+	dri.c \
+	driWrap.c \
+	xprAppleWM.c \
+	xprCursor.c \
+	xprEvent.c \
+	xprFrame.c \
+	xprScreen.c \
+	x-hash.c \
+	x-hook.c \
+	x-list.c
+
+EXTRA_DIST = \
+	dri.h \
+	driWrap.h \
+	dristruct.h \
+	appledri.h \
+	appledristr.h \
+	x-hash.h \
+	x-hook.h \
+	x-list.h \
+	xpr.h \
+	xprEvent.h