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

3 files changed, 85 insertions, 85 deletions

diff --git a/libX11/nls/zh_CN/Compose.pre b/libX11/nls/zh_CN/Compose.pre
index d7ec8005f..2f04b4218 100644
--- a/libX11/nls/zh_CN/Compose.pre
+++ b/libX11/nls/zh_CN/Compose.pre
@@ -1,14 +1,14 @@
-XCOMM

-XCOMM zh Compose Sequence

-XCOMM

-XCOMM Sequence Definition

-XCOMM

-XCOMM

-XCOMM This file currently has no entries.  It appears that a compose file (even

-XCOMM just an empty one) is required for the appropriate keysyms to work for

-XCOMM this encoding.

-XCOMM

-XCOMM <Multi_key> Means <Compose>

-XCOMM Special Character

-

-XCOMM End of Sequence Definition

+XCOMM
+XCOMM zh Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+XCOMM
+XCOMM
+XCOMM This file currently has no entries.  It appears that a compose file (even
+XCOMM just an empty one) is required for the appropriate keysyms to work for
+XCOMM this encoding.
+XCOMM
+XCOMM <Multi_key> Means <Compose>
+XCOMM Special Character
+
+XCOMM End of Sequence Definition
diff --git a/libX11/nls/zh_CN/XI18N_OBJS b/libX11/nls/zh_CN/XI18N_OBJS
index bc7f81bfc..3ad1a6230 100644
--- a/libX11/nls/zh_CN/XI18N_OBJS
+++ b/libX11/nls/zh_CN/XI18N_OBJS
@@ -1,9 +1,9 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME

-#

-#	XI18N objects table for zh locale

-#

-#

-XLC	common/xlocale	_XlcEucLoader	# XLC_open

-XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open

-XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister

-XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for zh locale
+#
+#
+XLC	common/xlocale	_XlcEucLoader	# XLC_open
+XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/libX11/nls/zh_CN/XLC_LOCALE.pre b/libX11/nls/zh_CN/XLC_LOCALE.pre
index f8d60a70a..0065d8df1 100644
--- a/libX11/nls/zh_CN/XLC_LOCALE.pre
+++ b/libX11/nls/zh_CN/XLC_LOCALE.pre
@@ -1,62 +1,62 @@
-XCOMM  XLocale Database Sample for zh (eucCN).

-XCOMM

-

-XCOMM

-XCOMM 	XLC_FONTSET category

-XCOMM

-XLC_FONTSET

-XCOMM 	fs0 class (7 bit ASCII)

-fs0	{

-	charset	{

-		name	ISO8859-1:GL

-	}

-	font	{

-		primary		ISO8859-1:GL

-		vertical_rotate	all

-	}

-}

-XCOMM 	fs1 class

-fs1	{

-	charset	{

-		name	GB2312.1980-0:GL

-	}

-	font	{

-		primary	GB2312.1980-0:GL

-		substitute	GB2312.1980-0:GLGR

-	}

-}

-END XLC_FONTSET

-

-XCOMM

-XCOMM 	XLC_XLOCALE category

-XCOMM

-XLC_XLOCALE

-

-encoding_name		zh.euc

-mb_cur_max		2

-state_depend_encoding	False

-wc_encoding_mask	\x30000000

-wc_shift_bits		7

-

-#ifndef X_LOCALE

-use_stdc_env		True

-force_convert_to_mb	True

-#endif

-

-XCOMM 	cs0 class

-cs0	{

-	side		GL:Default

-	length		1

-	wc_encoding	\x00000000

-	ct_encoding	ISO8859-1:GL

-}

-

-XCOMM 	cs1 class

-cs1	{

-	side		GR:Default

-	length		2

-	wc_encoding	\x30000000

-	ct_encoding	GB2312.1980-0:GL; GB2312.1980-0:GR

-}

-

-END XLC_XLOCALE

+XCOMM  XLocale Database Sample for zh (eucCN).
+XCOMM
+
+XCOMM
+XCOMM 	XLC_FONTSET category
+XCOMM
+XLC_FONTSET
+XCOMM 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+XCOMM 	fs1 class
+fs1	{
+	charset	{
+		name	GB2312.1980-0:GL
+	}
+	font	{
+		primary	GB2312.1980-0:GL
+		substitute	GB2312.1980-0:GLGR
+	}
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM 	XLC_XLOCALE category
+XCOMM
+XLC_XLOCALE
+
+encoding_name		zh.euc
+mb_cur_max		2
+state_depend_encoding	False
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+#ifndef X_LOCALE
+use_stdc_env		True
+force_convert_to_mb	True
+#endif
+
+XCOMM 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-1:GL
+}
+
+XCOMM 	cs1 class
+cs1	{
+	side		GR:Default
+	length		2
+	wc_encoding	\x30000000
+	ct_encoding	GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+
+END XLC_XLOCALE