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

diff --git a/libX11/nls/zh_HK.big5hkscs/Compose.pre b/libX11/nls/zh_HK.big5hkscs/Compose.pre
index 14ec90348..a06611f07 100644
--- a/libX11/nls/zh_HK.big5hkscs/Compose.pre
+++ b/libX11/nls/zh_HK.big5hkscs/Compose.pre
@@ -1,13 +1,13 @@
-XCOMM

-XCOMM zh_HK.big5hkscs Compose Sequence

-XCOMM

-XCOMM Sequence Definition

-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_HK.big5hkscs Compose Sequence
+XCOMM
+XCOMM Sequence Definition
+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_HK.big5hkscs/XI18N_OBJS b/libX11/nls/zh_HK.big5hkscs/XI18N_OBJS
index e5ccf4a21..29dc2167a 100644
--- a/libX11/nls/zh_HK.big5hkscs/XI18N_OBJS
+++ b/libX11/nls/zh_HK.big5hkscs/XI18N_OBJS
@@ -1,7 +1,7 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME

-#

-#	XI18N objects table for zh_HK.big5hkscs locale

-#

-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_HK.big5hkscs locale
+#
+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_HK.big5hkscs/XLC_LOCALE.pre b/libX11/nls/zh_HK.big5hkscs/XLC_LOCALE.pre
index 7aae554a0..dc19438dd 100644
--- a/libX11/nls/zh_HK.big5hkscs/XLC_LOCALE.pre
+++ b/libX11/nls/zh_HK.big5hkscs/XLC_LOCALE.pre
@@ -1,71 +1,71 @@
-XCOMM

-XCOMM (c) 1996, X11R6 L10N for Taiwan and Big5 Encoding Project

-XCOMM

-XCOMM modified for X11R6.3 by Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw> 1998/01/10

-XCOMM modified for Big5HKSCS by Roger So <roger.so@sw-linux.com> 

-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 (HKSCS extensions)

-fs1	{

-	charset	{

-		name	BIG5HKSCS-0:GLGR

-	}

-	font	{

-		primary		BIG5HKSCS-0:GLGR

-		substitute	BIG5HKSCS-0:GLGR

-	}

-}

-END XLC_FONTSET

-

-XCOMM

-XCOMM	XLC_XLOCALE category

-XCOMM

-XLC_XLOCALE

-

-encoding_name		zh_HK.big5hkscs

-mb_cur_max		2

-state_depend_encoding	False

-

-wc_encoding_mask	\x00008000

-wc_shift_bits		8

-

-use_stdc_env		True

-force_convert_to_mb	True

-

-+XCOMM	cs0 class

-cs0	{

-	side		GL:Default

-	length		1

-	wc_encoding	\x00000000

-	ct_encoding	ISO8859-1:GL

-}

-

-XCOMM	cs1 class

-cs1	{

-	side		none

-	length		2

-	byte1		\x85,\xfe

-	byte2		\x40,\x7e;\xa1,\xfe

-

-	wc_encoding	\x00008000

-	ct_encoding	BIG5HKSCS-0:GLGR:\x1b\x25\x2f\x32

-

-	mb_conversion	[\x8540,\xfefe]->\x0540

-	ct_conversion	[\x0540,\x7efe]->\x8540

-}

-

-END XLC_XLOCALE

+XCOMM
+XCOMM (c) 1996, X11R6 L10N for Taiwan and Big5 Encoding Project
+XCOMM
+XCOMM modified for X11R6.3 by Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw> 1998/01/10
+XCOMM modified for Big5HKSCS by Roger So <roger.so@sw-linux.com> 
+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 (HKSCS extensions)
+fs1	{
+	charset	{
+		name	BIG5HKSCS-0:GLGR
+	}
+	font	{
+		primary		BIG5HKSCS-0:GLGR
+		substitute	BIG5HKSCS-0:GLGR
+	}
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM	XLC_XLOCALE category
+XCOMM
+XLC_XLOCALE
+
+encoding_name		zh_HK.big5hkscs
+mb_cur_max		2
+state_depend_encoding	False
+
+wc_encoding_mask	\x00008000
+wc_shift_bits		8
+
+use_stdc_env		True
+force_convert_to_mb	True
+
++XCOMM	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-1:GL
+}
+
+XCOMM	cs1 class
+cs1	{
+	side		none
+	length		2
+	byte1		\x85,\xfe
+	byte2		\x40,\x7e;\xa1,\xfe
+
+	wc_encoding	\x00008000
+	ct_encoding	BIG5HKSCS-0:GLGR:\x1b\x25\x2f\x32
+
+	mb_conversion	[\x8540,\xfefe]->\x0540
+	ct_conversion	[\x0540,\x7efe]->\x8540
+}
+
+END XLC_XLOCALE