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

9 files changed, 55 insertions, 55 deletions

diff --git a/libXau/man/Makefile.am b/libXau/man/Makefile.am
index 694c376b0..4becb8acc 100644
--- a/libXau/man/Makefile.am
+++ b/libXau/man/Makefile.am
@@ -1,47 +1,47 @@
-#

-# Copyright (c) 2010, Oracle and/or its affiliates. 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

-# 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 NONINFRINGEMENT.  IN NO EVENT SHALL

-# THE AUTHORS OR COPYRIGHT HOLDERS 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.

-#

-

-libmandir = $(LIB_MAN_DIR)

-

-libman_PRE =				\

-	Xau.man				\

-	XauDisposeAuth.man		\

-	XauFileName.man			\

-	XauGetAuthByAddr.man		\

-	XauGetBestAuthByAddr.man	\

-	XauLockAuth.man			\

-	XauReadAuth.man			\

-	XauUnlockAuth.man		\

-	XauWriteAuth.man

-

-libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))

-

-EXTRA_DIST = $(libman_PRE)

-

-CLEANFILES = $(libman_DATA)

-

-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

-SUFFIXES = .$(LIB_MAN_SUFFIX) .man

-

-.man.$(LIB_MAN_SUFFIX):

-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

+#
+# Copyright (c) 2010, Oracle and/or its affiliates. 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
+# 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+
+libmandir = $(LIB_MAN_DIR)
+
+libman_PRE =				\
+	Xau.man				\
+	XauDisposeAuth.man		\
+	XauFileName.man			\
+	XauGetAuthByAddr.man		\
+	XauGetBestAuthByAddr.man	\
+	XauLockAuth.man			\
+	XauReadAuth.man			\
+	XauUnlockAuth.man		\
+	XauWriteAuth.man
+
+libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))
+
+EXTRA_DIST = $(libman_PRE)
+
+CLEANFILES = $(libman_DATA)
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+
+.man.$(LIB_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/libXau/man/XauDisposeAuth.man b/libXau/man/XauDisposeAuth.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauDisposeAuth.man
+++ b/libXau/man/XauDisposeAuth.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/libXau/man/XauFileName.man b/libXau/man/XauFileName.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauFileName.man
+++ b/libXau/man/XauFileName.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/libXau/man/XauGetAuthByAddr.man b/libXau/man/XauGetAuthByAddr.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauGetAuthByAddr.man
+++ b/libXau/man/XauGetAuthByAddr.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/libXau/man/XauGetBestAuthByAddr.man b/libXau/man/XauGetBestAuthByAddr.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauGetBestAuthByAddr.man
+++ b/libXau/man/XauGetBestAuthByAddr.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/libXau/man/XauLockAuth.man b/libXau/man/XauLockAuth.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauLockAuth.man
+++ b/libXau/man/XauLockAuth.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/libXau/man/XauReadAuth.man b/libXau/man/XauReadAuth.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauReadAuth.man
+++ b/libXau/man/XauReadAuth.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/libXau/man/XauUnlockAuth.man b/libXau/man/XauUnlockAuth.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauUnlockAuth.man
+++ b/libXau/man/XauUnlockAuth.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__
diff --git a/libXau/man/XauWriteAuth.man b/libXau/man/XauWriteAuth.man
index d20306a06..df111d626 100644
--- a/libXau/man/XauWriteAuth.man
+++ b/libXau/man/XauWriteAuth.man
@@ -1 +1 @@
-.so man__libmansuffix__/Xau.__libmansuffix__

+.so man__libmansuffix__/Xau.__libmansuffix__