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

3 files changed, 177 insertions, 177 deletions

diff --git a/libX11/nls/ru_RU.UTF-8/Compose.pre b/libX11/nls/ru_RU.UTF-8/Compose.pre
index 6c2c4114d..5a4dd18b9 100644
--- a/libX11/nls/ru_RU.UTF-8/Compose.pre
+++ b/libX11/nls/ru_RU.UTF-8/Compose.pre
@@ -1 +1 @@
-include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"

diff --git a/libX11/nls/ru_RU.UTF-8/XI18N_OBJS b/libX11/nls/ru_RU.UTF-8/XI18N_OBJS
index 842fc27f3..1f8498788 100644
--- a/libX11/nls/ru_RU.UTF-8/XI18N_OBJS
+++ b/libX11/nls/ru_RU.UTF-8/XI18N_OBJS
@@ -1,7 +1,7 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
-#
-#	XI18N objects table for ru_RU.UTF-8 locale
-#
-XLC	common/xlcUTF8Load	_XlcUtf8Loader	# 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 ru_RU.UTF-8 locale

+#

+XLC	common/xlcUTF8Load	_XlcUtf8Loader	# 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/ru_RU.UTF-8/XLC_LOCALE.pre b/libX11/nls/ru_RU.UTF-8/XLC_LOCALE.pre
index d2f397e47..9ae59e166 100644
--- a/libX11/nls/ru_RU.UTF-8/XLC_LOCALE.pre
+++ b/libX11/nls/ru_RU.UTF-8/XLC_LOCALE.pre
@@ -1,169 +1,169 @@
-XCOMM
-XCOMM	XLocale Database Sample for ru_RU.UTF-8
-XCOMM	Derived from 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 (KOI8-R)
-fs2	{
-	charset	{
-		name	KOI8-R:GR
-	}
-	font	{
-		primary	KOI8-R:GR
-	}
-}
-XCOMM	fs3 class (MICROSOFT-CP1251)
-fs3	{
-	charset	{
-		name	MICROSOFT-CP1251:GR
-	}
-	font	{
-		primary	MICROSOFT-CP1251:GR
-	}
-}
-XCOMM	fs4 class (ISO8859-5)
-fs4	{
-	charset	{
-		name	ISO8859-5:GR
-	}
-	font	{
-		primary	ISO8859-5:GR
-	}
-}
-XCOMM 	fs5 class (Kanji)
-fs5	{
-	charset	{
-		name	JISX0208.1983-0:GL
-	}
-	font	{
-		primary	JISX0208.1983-0:GL
-	}
-}
-XCOMM	fs6 class (Korean Character)
-fs6	{
-	charset	{
-		name	KSC5601.1987-0:GL
-	}
-	font	{
-		primary	KSC5601.1987-0:GL
-	}
-}
-XCOMM	fs7 class (Chinese Han Character)
-fs7	{
-	charset	{
-		name	GB2312.1980-0:GL
-	}
-	font	{
-		primary	GB2312.1980-0:GL
-	}
-}
-XCOMM	fs8 class (Half Kana)
-fs8	{
-	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	fs9 class
-fs9	{
-	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	XLocale Database Sample for ru_RU.UTF-8

+XCOMM	Derived from 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 (KOI8-R)

+fs2	{

+	charset	{

+		name	KOI8-R:GR

+	}

+	font	{

+		primary	KOI8-R:GR

+	}

+}

+XCOMM	fs3 class (MICROSOFT-CP1251)

+fs3	{

+	charset	{

+		name	MICROSOFT-CP1251:GR

+	}

+	font	{

+		primary	MICROSOFT-CP1251:GR

+	}

+}

+XCOMM	fs4 class (ISO8859-5)

+fs4	{

+	charset	{

+		name	ISO8859-5:GR

+	}

+	font	{

+		primary	ISO8859-5:GR

+	}

+}

+XCOMM 	fs5 class (Kanji)

+fs5	{

+	charset	{

+		name	JISX0208.1983-0:GL

+	}

+	font	{

+		primary	JISX0208.1983-0:GL

+	}

+}

+XCOMM	fs6 class (Korean Character)

+fs6	{

+	charset	{

+		name	KSC5601.1987-0:GL

+	}

+	font	{

+		primary	KSC5601.1987-0:GL

+	}

+}

+XCOMM	fs7 class (Chinese Han Character)

+fs7	{

+	charset	{

+		name	GB2312.1980-0:GL

+	}

+	font	{

+		primary	GB2312.1980-0:GL

+	}

+}

+XCOMM	fs8 class (Half Kana)

+fs8	{

+	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	fs9 class

+fs9	{

+	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