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

diff --git a/xorg-server/xkeyboard-config/symbols/compose b/xorg-server/xkeyboard-config/symbols/compose
index 520d44aaf..d7257329e 100644
--- a/xorg-server/xkeyboard-config/symbols/compose
+++ b/xorg-server/xkeyboard-config/symbols/compose
@@ -1,54 +1,54 @@
-partial modifier_keys

-xkb_symbols "ralt" {

-    key <RALT>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "lwin" {

-    key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "rwin" {

-    key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "menu" {

-    key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "rctrl" {

-    key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "lctrl" {

-    key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "caps" {

-    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "102" {

-    key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "paus" {

-    key <PAUS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "prsc" {

-    key <PRSC> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

-

-partial modifier_keys

-xkb_symbols "sclk" {

-    key <SCLK> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };

-};

+partial modifier_keys
+xkb_symbols "ralt" {
+    key <RALT>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "lwin" {
+    key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rwin" {
+    key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "menu" {
+    key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rctrl" {
+    key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "lctrl" {
+    key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "caps" {
+    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "102" {
+    key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "paus" {
+    key <PAUS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "prsc" {
+    key <PRSC> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "sclk" {
+    key <SCLK> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};