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, 163 insertions, 163 deletions

diff --git a/libX11/nls/zh_TW/Compose.pre b/libX11/nls/zh_TW/Compose.pre
index 32be5b186..79be29051 100644
--- a/libX11/nls/zh_TW/Compose.pre
+++ b/libX11/nls/zh_TW/Compose.pre
@@ -1,14 +1,14 @@
-XCOMM

-XCOMM zh_TW 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_TW 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_TW/XI18N_OBJS b/libX11/nls/zh_TW/XI18N_OBJS
index e8218cf29..0f471dd00 100644
--- a/libX11/nls/zh_TW/XI18N_OBJS
+++ b/libX11/nls/zh_TW/XI18N_OBJS
@@ -1,7 +1,7 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME

-#

-#	XI18N objects table for zh_TW locale

-#

-XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open

-XIM	common/ximp40		_Ximp_OpenIM		# XIM_open

-XOM	common/xomGeneric	_XomGenericOpenOM # XOM_open

+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for zh_TW locale
+#
+XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
+XIM	common/ximp40		_Ximp_OpenIM		# XIM_open
+XOM	common/xomGeneric	_XomGenericOpenOM # XOM_open
diff --git a/libX11/nls/zh_TW/XLC_LOCALE.pre b/libX11/nls/zh_TW/XLC_LOCALE.pre
index 7eed43670..d75ece85f 100644
--- a/libX11/nls/zh_TW/XLC_LOCALE.pre
+++ b/libX11/nls/zh_TW/XLC_LOCALE.pre
@@ -1,142 +1,142 @@
-XCOMM  XLocale Database Sample for zh_TW

-XCOMM 

-XCOMM Note: In lib/X11/lcCT.c, charset names for CNS11643 coded character

-XCOMM sets are defined as CNS11643.1986-1 and -2.  In the ECMA Registry,

-XCOMM CNS coded character sets 1-7 are registered as CNS 11643-1992.

-XCOMM CJK.INF Version 1.7 (August 15, 1995) written by Ken Lunde says

-XCOMM plane 14 of CNS 11643-1983 now became plane 3 of CNS 11643-1992.

-XCOMM I do not know how Taiwanese EUC is organized currently, so I left the

-XCOMM X11R6 organization of fsN/csN as it is and only changed "CNS11643-*"

-XCOMM to "CNS11643.1986-*".

-XCOMM	1995-10-24	T. Numata (numa@rp.open.cs.fujitsu.co.jp)

-

-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	CNS11643.1986-1:GL

-	}

-	font	{

-		primary	CNS11643.1986-1:GL

-	}

-}

-XCOMM 	fs2 class

-fs2	{

-	charset	{

-		name	CNS11643.1986-2:GL

-	}

-	font	{

-		primary	CNS11643.1986-2:GL

-	}

-}

-XCOMM 	fs3 class 

-fs3	{

-	charset	{

-		name	CNS11643.1986-14:GL

-	}

-	font	{

-		primary	CNS11643.1986-14:GL

-	}

-}

-XCOMM 	fs4 class 

-fs4	{

-	charset	{

-		name	CNS11643.1986-15:GL

-	}

-	font	{

-		primary	CNS11643.1986-15:GL

-	}

-}

-XCOMM 	fs5 class 

-fs5	{

-	charset	{

-		name	CNS11643.1986-16:GL

-	}

-	font	{

-		primary	CNS11643.1986-16:GL

-	}

-}

-END XLC_FONTSET

-

-XCOMM 

-XCOMM 	XLC_XLOCALE category

-XCOMM 

-XLC_XLOCALE

-

-encoding_name		zh_TW.euc

-mb_cur_max		4

-state_depend_encoding	False

-wc_encoding_mask	\x3fffc000

-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; CNS11643.1986-0:GL

-}

-

-XCOMM 	cs1 class

-cs1	{

-	side		GR:Default

-	length		2

-	wc_encoding	\x30000000

-	ct_encoding	CNS11643.1986-1:GR

-}

-

-XCOMM 	cs2 class	# plane 2

-cs2	{

-	side		GR

-	length		2

-	mb_encoding	<SS> \x8e\xa2

-	wc_encoding	\x10088000

-	ct_encoding	CNS11643.1986-2:GR

-}

-

-XCOMM 	cs3 class	# plane 14

-cs3	{

-	side		GR

-	length		2

-	mb_encoding	<SS> \x8e\xae

-	wc_encoding	\x100b8000

-	ct_encoding	CNS11643.1986-14:GR

-}

-

-XCOMM 	cs4 class	# plane 15

-cs4	{

-	side		GR

-	length		2

-	mb_encoding	<SS> \x8e\xaf

-	wc_encoding	\x100bc000

-	ct_encoding	CNS11643.1986-15:GR

-}

-

-XCOMM 	cs5 class	# plane 16

-cs5	{

-	side		GR

-	length		2

-	mb_encoding	<SS> \x8e\xb0

-	wc_encoding	\x100c0000

-	ct_encoding	CNS11643.1986-16:GR

-}

-

-END XLC_XLOCALE

+XCOMM  XLocale Database Sample for zh_TW
+XCOMM 
+XCOMM Note: In lib/X11/lcCT.c, charset names for CNS11643 coded character
+XCOMM sets are defined as CNS11643.1986-1 and -2.  In the ECMA Registry,
+XCOMM CNS coded character sets 1-7 are registered as CNS 11643-1992.
+XCOMM CJK.INF Version 1.7 (August 15, 1995) written by Ken Lunde says
+XCOMM plane 14 of CNS 11643-1983 now became plane 3 of CNS 11643-1992.
+XCOMM I do not know how Taiwanese EUC is organized currently, so I left the
+XCOMM X11R6 organization of fsN/csN as it is and only changed "CNS11643-*"
+XCOMM to "CNS11643.1986-*".
+XCOMM	1995-10-24	T. Numata (numa@rp.open.cs.fujitsu.co.jp)
+
+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	CNS11643.1986-1:GL
+	}
+	font	{
+		primary	CNS11643.1986-1:GL
+	}
+}
+XCOMM 	fs2 class
+fs2	{
+	charset	{
+		name	CNS11643.1986-2:GL
+	}
+	font	{
+		primary	CNS11643.1986-2:GL
+	}
+}
+XCOMM 	fs3 class 
+fs3	{
+	charset	{
+		name	CNS11643.1986-14:GL
+	}
+	font	{
+		primary	CNS11643.1986-14:GL
+	}
+}
+XCOMM 	fs4 class 
+fs4	{
+	charset	{
+		name	CNS11643.1986-15:GL
+	}
+	font	{
+		primary	CNS11643.1986-15:GL
+	}
+}
+XCOMM 	fs5 class 
+fs5	{
+	charset	{
+		name	CNS11643.1986-16:GL
+	}
+	font	{
+		primary	CNS11643.1986-16:GL
+	}
+}
+END XLC_FONTSET
+
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name		zh_TW.euc
+mb_cur_max		4
+state_depend_encoding	False
+wc_encoding_mask	\x3fffc000
+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; CNS11643.1986-0:GL
+}
+
+XCOMM 	cs1 class
+cs1	{
+	side		GR:Default
+	length		2
+	wc_encoding	\x30000000
+	ct_encoding	CNS11643.1986-1:GR
+}
+
+XCOMM 	cs2 class	# plane 2
+cs2	{
+	side		GR
+	length		2
+	mb_encoding	<SS> \x8e\xa2
+	wc_encoding	\x10088000
+	ct_encoding	CNS11643.1986-2:GR
+}
+
+XCOMM 	cs3 class	# plane 14
+cs3	{
+	side		GR
+	length		2
+	mb_encoding	<SS> \x8e\xae
+	wc_encoding	\x100b8000
+	ct_encoding	CNS11643.1986-14:GR
+}
+
+XCOMM 	cs4 class	# plane 15
+cs4	{
+	side		GR
+	length		2
+	mb_encoding	<SS> \x8e\xaf
+	wc_encoding	\x100bc000
+	ct_encoding	CNS11643.1986-15:GR
+}
+
+XCOMM 	cs5 class	# plane 16
+cs5	{
+	side		GR
+	length		2
+	mb_encoding	<SS> \x8e\xb0
+	wc_encoding	\x100c0000
+	ct_encoding	CNS11643.1986-16:GR
+}
+
+END XLC_XLOCALE