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

diff --git a/libX11/nls/georgian-ps/Compose.pre b/libX11/nls/georgian-ps/Compose.pre
index 672835b1d..acbebbf63 100644
--- a/libX11/nls/georgian-ps/Compose.pre
+++ b/libX11/nls/georgian-ps/Compose.pre
@@ -1,14 +1,14 @@
-XCOMM
-XCOMM georgian-ps 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 georgian-ps 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/georgian-ps/XI18N_OBJS b/libX11/nls/georgian-ps/XI18N_OBJS
index 558452d9d..b9907e77d 100644
--- a/libX11/nls/georgian-ps/XI18N_OBJS
+++ b/libX11/nls/georgian-ps/XI18N_OBJS
@@ -1,7 +1,7 @@
-# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
-#
-#	XI18N objects table for georgian-ps locale
-#
-XLC	common/xlcDef	_XlcDefaultLoader	# 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 georgian-ps locale

+#

+XLC	common/xlcDef	_XlcDefaultLoader	# 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/georgian-ps/XLC_LOCALE.pre b/libX11/nls/georgian-ps/XLC_LOCALE.pre
index 470dcae2d..9c1ba03d3 100644
--- a/libX11/nls/georgian-ps/XLC_LOCALE.pre
+++ b/libX11/nls/georgian-ps/XLC_LOCALE.pre
@@ -1,79 +1,79 @@
-XCOMM  XLocale Database Sample for georgian-ps
-XCOMM 
-
-XCOMM 
-XCOMM 	XLC_FONTSET category
-XCOMM 
-XLC_FONTSET
-XCOMM 	fs0 class (7 bit ASCII)
-fs0	{
-	charset	{
-		name		ISO8859-1:GL
-	}
-	font	{
-		primary		GEORGIAN-PS:GL 
-		substitute	ISO8859-1:GL
-	}
-}
-XCOMM 	fs1 class 
-fs1	{
-	charset         GEORGIAN-PS:GR
-	font            GEORGIAN-PS:GR
-}
-END XLC_FONTSET
-
-XCOMM
-XCOMM	XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0	{
-	charset_name	GEORGIAN-PS
-	side		GR
-	length		1
-	string_encoding	False
-	sequence	\x1b%/1
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM 
-XCOMM 	XLC_XLOCALE category
-XCOMM 
-XLC_XLOCALE
-
-encoding_name           GEORGIAN-PS
-mb_cur_max		1
-state_depend_encoding	False
-#if WCHAR32
-wc_encoding_mask	\x30000000
-wc_shift_bits		7
-#else
-wc_encoding_mask	\x00008080
-wc_shift_bits		8
-#endif
-
-#ifndef X_LOCALE
-use_stdc_env		True
-#endif
-
-XCOMM 	cs0 class
-cs0	{
-	side		GL:Default
-	length		1
-	wc_encoding	\x00000000
-	ct_encoding     GEORGIAN-PS:GL; ISO8859-1:GL
-}
-
-
-XCOMM 	cs1 class
-cs1	{
-	side		GR:Default
-	length		1
-#if WCHAR32
-	wc_encoding	\x30000000
-#else
-	wc_encoding	\x00008080
-#endif
-	ct_encoding     GEORGIAN-PS:GR
-}
-
-END XLC_XLOCALE
+XCOMM  XLocale Database Sample for georgian-ps

+XCOMM 

+

+XCOMM 

+XCOMM 	XLC_FONTSET category

+XCOMM 

+XLC_FONTSET

+XCOMM 	fs0 class (7 bit ASCII)

+fs0	{

+	charset	{

+		name		ISO8859-1:GL

+	}

+	font	{

+		primary		GEORGIAN-PS:GL 

+		substitute	ISO8859-1:GL

+	}

+}

+XCOMM 	fs1 class 

+fs1	{

+	charset         GEORGIAN-PS:GR

+	font            GEORGIAN-PS:GR

+}

+END XLC_FONTSET

+

+XCOMM

+XCOMM	XLC_CHARSET_DEFINE category

+XCOMM

+XLC_CHARSET_DEFINE

+csd0	{

+	charset_name	GEORGIAN-PS

+	side		GR

+	length		1

+	string_encoding	False

+	sequence	\x1b%/1

+}

+END XLC_CHARSET_DEFINE

+

+XCOMM 

+XCOMM 	XLC_XLOCALE category

+XCOMM 

+XLC_XLOCALE

+

+encoding_name           GEORGIAN-PS

+mb_cur_max		1

+state_depend_encoding	False

+#if WCHAR32

+wc_encoding_mask	\x30000000

+wc_shift_bits		7

+#else

+wc_encoding_mask	\x00008080

+wc_shift_bits		8

+#endif

+

+#ifndef X_LOCALE

+use_stdc_env		True

+#endif

+

+XCOMM 	cs0 class

+cs0	{

+	side		GL:Default

+	length		1

+	wc_encoding	\x00000000

+	ct_encoding     GEORGIAN-PS:GL; ISO8859-1:GL

+}

+

+

+XCOMM 	cs1 class

+cs1	{

+	side		GR:Default

+	length		1

+#if WCHAR32

+	wc_encoding	\x30000000

+#else

+	wc_encoding	\x00008080

+#endif

+	ct_encoding     GEORGIAN-PS:GR

+}

+

+END XLC_XLOCALE