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

1 files changed, 149 insertions, 149 deletions

diff --git a/libX11/nls/ja_JP.UTF-8/XLC_LOCALE.pre b/libX11/nls/ja_JP.UTF-8/XLC_LOCALE.pre
index c1c4e8e00..0f5ebe29d 100644
--- a/libX11/nls/ja_JP.UTF-8/XLC_LOCALE.pre
+++ b/libX11/nls/ja_JP.UTF-8/XLC_LOCALE.pre
@@ -1,149 +1,149 @@
-XCOMM 

-

-XCOMM 

-XCOMM 	XLC_FONTSET category

-XCOMM 

-XLC_FONTSET

-

-on_demand_loading	True

-

-object_name		generic

-

-XCOMM We leave the legacy encodings in for the moment, because we don't

-XCOMM have that many ISO10646 fonts yet.

-XCOMM   fs0 class (7 bit ASCII)

-fs0 {

-  charset {

-    name  ISO8859-1:GL

-  }

-  font  {

-    primary   ISO8859-1:GL

-    vertical_rotate all

-  }

-}

-XCOMM fs1 class (ISO8859 families)

-fs1 {

-  charset {

-    name  ISO8859-1:GR

-  }

-  font  {

-    primary ISO8859-1:GR

-  }

-}

-

-XCOMM 	fs2 class (Kanji)

-fs2	{

-	charset	{

-		name	JISX0208.1983-0:GL

-	}

-	font	{

-		primary	JISX0208.1983-0:GL

-	}

-}

-

-XCOMM   fs3 class (Korean Character)

-fs3	{

-	charset	{

-		name	KSC5601.1987-0:GL

-	}

-	font	{

-		primary	KSC5601.1987-0:GL

-	}

-}

-

-XCOMM   fs4 class (Chinese Han Character)

-fs4	{

-	charset	{

-		name	GB2312.1980-0:GL

-	}

-	font	{

-		primary	GB2312.1980-0:GL

-	}

-}

-XCOMM	fs5 class (Half Kana)

-fs5	{

-	charset	{

-		name	JISX0201.1976-0:GR

-	}

-	font	{

-		primary		JISX0201.1976-0:GR

-		vertical_rotate	all

-	}

-}

-XCOMM ISO10646-1 is put last to make usually better-looking

-XCOMM other fonts are picked up before iso10646-1 fonts.

-XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all

-XCOMM in ISO8859-X ranges.

-

-XCOMM fs6 class

-fs6 {

-  charset {

-    name  ISO10646-1

-  }

-  font  {

-    primary ISO10646-1

-  }

-}

-

-END XLC_FONTSET

-

-XCOMM 

-XCOMM 	XLC_XLOCALE category

-XCOMM 

-XLC_XLOCALE

-

-encoding_name		UTF-8

-mb_cur_max		6

-state_depend_encoding	False

-

-XCOMM	cs0 class

-cs0	{

-	side		GL:Default

-	length		1

-	ct_encoding	ISO8859-1:GL

-}

-

-XCOMM	cs1 class

-cs1     {

-        side            GR:Default

-        length          1

-        ct_encoding     ISO8859-1:GR

-}

-

-XCOMM	cs2 class

-cs2	{

-	side		GR

-	length		2

-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;			JISX0208.1983-1:GL; JISX0208.1983-1:GR

-

-}

-

-XCOMM	cs3 class

-cs3     {

-        side            GL

-        length          2

-        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;                        KSC5601.1987-1:GL; KSC5601.1987-1:GR

-

-}

- 

-XCOMM	cs4 class

-cs4     {

-        side            GR

-        length          2

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

-}

- 

-XCOMM	cs5 class

-cs5	{

-	side		GR

-	length		1

-	ct_encoding	JISX0201.1976-0:GR

-}

-

-XCOMM	cs6 class

-cs6	{

-	side		none

-	ct_encoding	ISO10646-1

-}

-

-END XLC_XLOCALE

+XCOMM 
+
+XCOMM 
+XCOMM 	XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+
+on_demand_loading	True
+
+object_name		generic
+
+XCOMM We leave the legacy encodings in for the moment, because we don't
+XCOMM have that many ISO10646 fonts yet.
+XCOMM   fs0 class (7 bit ASCII)
+fs0 {
+  charset {
+    name  ISO8859-1:GL
+  }
+  font  {
+    primary   ISO8859-1:GL
+    vertical_rotate all
+  }
+}
+XCOMM fs1 class (ISO8859 families)
+fs1 {
+  charset {
+    name  ISO8859-1:GR
+  }
+  font  {
+    primary ISO8859-1:GR
+  }
+}
+
+XCOMM 	fs2 class (Kanji)
+fs2	{
+	charset	{
+		name	JISX0208.1983-0:GL
+	}
+	font	{
+		primary	JISX0208.1983-0:GL
+	}
+}
+
+XCOMM   fs3 class (Korean Character)
+fs3	{
+	charset	{
+		name	KSC5601.1987-0:GL
+	}
+	font	{
+		primary	KSC5601.1987-0:GL
+	}
+}
+
+XCOMM   fs4 class (Chinese Han Character)
+fs4	{
+	charset	{
+		name	GB2312.1980-0:GL
+	}
+	font	{
+		primary	GB2312.1980-0:GL
+	}
+}
+XCOMM	fs5 class (Half Kana)
+fs5	{
+	charset	{
+		name	JISX0201.1976-0:GR
+	}
+	font	{
+		primary		JISX0201.1976-0:GR
+		vertical_rotate	all
+	}
+}
+XCOMM ISO10646-1 is put last to make usually better-looking
+XCOMM other fonts are picked up before iso10646-1 fonts.
+XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all
+XCOMM in ISO8859-X ranges.
+
+XCOMM fs6 class
+fs6 {
+  charset {
+    name  ISO10646-1
+  }
+  font  {
+    primary ISO10646-1
+  }
+}
+
+END XLC_FONTSET
+
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name		UTF-8
+mb_cur_max		6
+state_depend_encoding	False
+
+XCOMM	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	ct_encoding	ISO8859-1:GL
+}
+
+XCOMM	cs1 class
+cs1     {
+        side            GR:Default
+        length          1
+        ct_encoding     ISO8859-1:GR
+}
+
+XCOMM	cs2 class
+cs2	{
+	side		GR
+	length		2
+	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;			JISX0208.1983-1:GL; JISX0208.1983-1:GR
+
+}
+
+XCOMM	cs3 class
+cs3     {
+        side            GL
+        length          2
+        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
+
+}
+ 
+XCOMM	cs4 class
+cs4     {
+        side            GR
+        length          2
+        ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+ 
+XCOMM	cs5 class
+cs5	{
+	side		GR
+	length		1
+	ct_encoding	JISX0201.1976-0:GR
+}
+
+XCOMM	cs6 class
+cs6	{
+	side		none
+	ct_encoding	ISO10646-1
+}
+
+END XLC_XLOCALE