Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	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/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 300 insertions, 300 deletions

diff --git a/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre b/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
index 35d009f24..1678f9b3a 100644
--- a/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
+++ b/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
@@ -1,300 +1,300 @@
-XCOMM  XLocale Database Sample for en_US.UTF-8
-XCOMM 
-
-XCOMM 
-XCOMM 	XLC_FONTSET category
-XCOMM 
-XLC_FONTSET
-
-on_demand_loading	True
-
-object_name		generic
-
-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 (ISO8859 families)
-fs2	{
-	charset	{
-		name	ISO8859-2:GR
-	}
-	font	{
-		primary	ISO8859-2:GR
-	}
-}
-XCOMM	fs3 class (ISO8859 families)
-fs3	{
-	charset	{
-		name	ISO8859-3:GR
-	}
-	font	{
-		primary	ISO8859-3:GR
-	}
-}
-XCOMM	fs4 class (ISO8859 families)
-fs4	{
-	charset	{
-		name	ISO8859-4:GR
-	}
-	font	{
-		primary	ISO8859-4:GR
-	}
-}
-XCOMM	fs5 class (ISO8859 families)
-fs5	{
-	charset	{
-		name	ISO8859-5:GR
-	}
-	font	{
-		primary	ISO8859-5:GR
-	}
-}
-XCOMM	fs6 class (koi8-r)
-fs6	{
-	charset	{
-		name	KOI8-R:GR
-	}
-	font	{
-		primary	KOI8-R:GR
-	}
-}
-XCOMM	fs7 class (ISO8859 families)
-fs7	{
-	charset	{
-		name	ISO8859-7:GR
-	}
-	font	{
-		primary	ISO8859-7:GR
-	}
-}
-XCOMM	fs9 class (ISO8859 families)
-fs8	{
-	charset	{
-		name	ISO8859-9:GR
-	}
-	font	{
-		primary	ISO8859-9:GR
-	}
-}
-XCOMM	fs13 class (ISO8859 families)
-fs9	{
-	charset	{
-		name	ISO8859-13:GR
-	}
-	font	{
-		primary	ISO8859-13:GR
-	}
-}
-XCOMM	fs14 class (ISO8859 families)
-fs10	{
-	charset	{
-		name	ISO8859-14:GR
-	}
-	font	{
-		primary	ISO8859-14:GR
-	}
-}
-XCOMM	fs15 class (ISO8859 families)
-fs11	{
-	charset	{
-		name	ISO8859-15:GR
-	}
-	font	{
-		primary	ISO8859-15:GR
-	}
-}
-XCOMM 	fs16 class (Kanji)
-fs12	{
-	charset	{
-		name	JISX0208.1983-0:GL
-	}
-	font	{
-		primary	JISX0208.1983-0:GL
-	}
-}
-XCOMM   fs17 class (Korean Character)
-fs13	{
-	charset	{
-		name	KSC5601.1987-0:GL
-	}
-	font	{
-		primary	KSC5601.1987-0:GL
-	}
-}
-XCOMM   fs18 class (Chinese Han Character)
-fs14	{
-	charset	{
-		name	GB2312.1980-0:GL
-	}
-	font	{
-		primary	GB2312.1980-0:GL
-	}
-}
-XCOMM	fs20 class (Half Kana)
-fs15	{
-	charset	{
-		name	JISX0201.1976-0:GR
-	}
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate	all
-	}
-}
-XCOMM	ISO10646 should come last so the fonts above will actually be used
-XCOMM	fs24 class
-fs16	{
-	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          1
-        ct_encoding     ISO8859-2:GR
-}
- 
-XCOMM	cs3 class
-cs3     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-3:GR
-}
- 
-XCOMM	cs4 class
-cs4     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-4:GR
-}
- 
-XCOMM	cs5 class
-cs5     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-5:GR
-}
- 
-XCOMM	cs6 class
-cs6     {
-        side            GR
-        length          1
-        ct_encoding     KOI8-R:GR
-}
- 
-XCOMM	cs7 class
-cs7     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-7:GR
-}
- 
-XCOMM	cs9 class
-cs8     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-9:GR
-}
- 
-XCOMM	cs13 class
-cs9     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-13:GR
-}
- 
-XCOMM	cs14 class
-cs10     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-14:GR
-}
- 
-XCOMM	cs15 class
-cs11     {
-        side            GR
-        length          1
-        ct_encoding     ISO8859-15:GR
-}
- 
-XCOMM	cs16 class
-cs12	{
-	side		GR
-	length		2
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-}
-
-XCOMM	cs17 class
-cs13     {
-        side            GL
-        length          2
-        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
-                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
-}
- 
-XCOMM	cs18 class
-cs14     {
-        side            GR
-        length          2
-        ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
-}
- 
-XCOMM	cs20 class
-cs15	{
-	side		GR
-	length		1
-	ct_encoding	JISX0201.1976-0:GR
-}
- 
-XCOMM	cs24 class
-cs16	{
-	side		none
-	ct_encoding	ISO10646-1
-}
-
-END XLC_XLOCALE
+XCOMM  XLocale Database Sample for en_US.UTF-8

+XCOMM 

+

+XCOMM 

+XCOMM 	XLC_FONTSET category

+XCOMM 

+XLC_FONTSET

+

+on_demand_loading	True

+

+object_name		generic

+

+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 (ISO8859 families)

+fs2	{

+	charset	{

+		name	ISO8859-2:GR

+	}

+	font	{

+		primary	ISO8859-2:GR

+	}

+}

+XCOMM	fs3 class (ISO8859 families)

+fs3	{

+	charset	{

+		name	ISO8859-3:GR

+	}

+	font	{

+		primary	ISO8859-3:GR

+	}

+}

+XCOMM	fs4 class (ISO8859 families)

+fs4	{

+	charset	{

+		name	ISO8859-4:GR

+	}

+	font	{

+		primary	ISO8859-4:GR

+	}

+}

+XCOMM	fs5 class (ISO8859 families)

+fs5	{

+	charset	{

+		name	ISO8859-5:GR

+	}

+	font	{

+		primary	ISO8859-5:GR

+	}

+}

+XCOMM	fs6 class (koi8-r)

+fs6	{

+	charset	{

+		name	KOI8-R:GR

+	}

+	font	{

+		primary	KOI8-R:GR

+	}

+}

+XCOMM	fs7 class (ISO8859 families)

+fs7	{

+	charset	{

+		name	ISO8859-7:GR

+	}

+	font	{

+		primary	ISO8859-7:GR

+	}

+}

+XCOMM	fs9 class (ISO8859 families)

+fs8	{

+	charset	{

+		name	ISO8859-9:GR

+	}

+	font	{

+		primary	ISO8859-9:GR

+	}

+}

+XCOMM	fs13 class (ISO8859 families)

+fs9	{

+	charset	{

+		name	ISO8859-13:GR

+	}

+	font	{

+		primary	ISO8859-13:GR

+	}

+}

+XCOMM	fs14 class (ISO8859 families)

+fs10	{

+	charset	{

+		name	ISO8859-14:GR

+	}

+	font	{

+		primary	ISO8859-14:GR

+	}

+}

+XCOMM	fs15 class (ISO8859 families)

+fs11	{

+	charset	{

+		name	ISO8859-15:GR

+	}

+	font	{

+		primary	ISO8859-15:GR

+	}

+}

+XCOMM 	fs16 class (Kanji)

+fs12	{

+	charset	{

+		name	JISX0208.1983-0:GL

+	}

+	font	{

+		primary	JISX0208.1983-0:GL

+	}

+}

+XCOMM   fs17 class (Korean Character)

+fs13	{

+	charset	{

+		name	KSC5601.1987-0:GL

+	}

+	font	{

+		primary	KSC5601.1987-0:GL

+	}

+}

+XCOMM   fs18 class (Chinese Han Character)

+fs14	{

+	charset	{

+		name	GB2312.1980-0:GL

+	}

+	font	{

+		primary	GB2312.1980-0:GL

+	}

+}

+XCOMM	fs20 class (Half Kana)

+fs15	{

+	charset	{

+		name	JISX0201.1976-0:GR

+	}

+	font	{

+		primary		JISX0201.1976-0:GR

+		vertical_rotate	all

+	}

+}

+XCOMM	ISO10646 should come last so the fonts above will actually be used

+XCOMM	fs24 class

+fs16	{

+	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          1

+        ct_encoding     ISO8859-2:GR

+}

+ 

+XCOMM	cs3 class

+cs3     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-3:GR

+}

+ 

+XCOMM	cs4 class

+cs4     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-4:GR

+}

+ 

+XCOMM	cs5 class

+cs5     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-5:GR

+}

+ 

+XCOMM	cs6 class

+cs6     {

+        side            GR

+        length          1

+        ct_encoding     KOI8-R:GR

+}

+ 

+XCOMM	cs7 class

+cs7     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-7:GR

+}

+ 

+XCOMM	cs9 class

+cs8     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-9:GR

+}

+ 

+XCOMM	cs13 class

+cs9     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-13:GR

+}

+ 

+XCOMM	cs14 class

+cs10     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-14:GR

+}

+ 

+XCOMM	cs15 class

+cs11     {

+        side            GR

+        length          1

+        ct_encoding     ISO8859-15:GR

+}

+ 

+XCOMM	cs16 class

+cs12	{

+	side		GR

+	length		2

+	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\

+			JISX0208.1983-1:GL; JISX0208.1983-1:GR

+}

+

+XCOMM	cs17 class

+cs13     {

+        side            GL

+        length          2

+        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;\

+                        KSC5601.1987-1:GL; KSC5601.1987-1:GR

+}

+ 

+XCOMM	cs18 class

+cs14     {

+        side            GR

+        length          2

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

+}

+ 

+XCOMM	cs20 class

+cs15	{

+	side		GR

+	length		1

+	ct_encoding	JISX0201.1976-0:GR

+}

+ 

+XCOMM	cs24 class

+cs16	{

+	side		none

+	ct_encoding	ISO10646-1

+}

+

+END XLC_XLOCALE