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

diff --git a/xorg-server/xkeyboard-config/compat/accessx b/xorg-server/xkeyboard-config/compat/accessx
index 26cafab7a..0ed34ced1 100644
--- a/xorg-server/xkeyboard-config/compat/accessx
+++ b/xorg-server/xkeyboard-config/compat/accessx
@@ -1,52 +1,52 @@
-default partial xkb_compatibility "basic" {

-    interpret AccessX_Enable { 

-	action= LockControls(controls=AccessXKeys); 

-    };

-};

-

-partial xkb_compatibility "full" {

-

-    interpret AccessX_Enable {

-	action= LockControls(controls=AccessXKeys); 

-    };

-

-    interpret AccessX_Feedback_Enable { 

-	action= LockControls(controls=AccessXFeedback); 

-    };

-

-    interpret RepeatKeys_Enable {

-	action= LockControls(controls=RepeatKeys);

-    };

-

-    interpret SlowKeys_Enable {

-	action= LockControls(controls=SlowKeys);

-    };

-

-    interpret BounceKeys_Enable {

-	action= LockControls(controls=BounceKeys);

-    };

-

-    interpret StickyKeys_Enable {

-	action= LockControls(controls=StickyKeys);

-    };

-

-    interpret MouseKeys_Enable {

-	action= LockControls(controls=MouseKeys);

-    };

-

-    interpret MouseKeys_Accel_Enable {

-	action= LockControls(controls=MouseKeysAccel);

-    };

-

-    interpret Overlay1_Enable {

-	action= LockControls(controls=Overlay1);

-    };

-

-    interpret Overlay2_Enable {

-	action= LockControls(controls=Overlay2);

-    };

-

-    interpret AudibleBell_Enable {

-	action= LockControls(controls=AudibleBell);

-    };

-};

+default partial xkb_compatibility "basic" {
+    interpret AccessX_Enable { 
+	action= LockControls(controls=AccessXKeys); 
+    };
+};
+
+partial xkb_compatibility "full" {
+
+    interpret AccessX_Enable {
+	action= LockControls(controls=AccessXKeys); 
+    };
+
+    interpret AccessX_Feedback_Enable { 
+	action= LockControls(controls=AccessXFeedback); 
+    };
+
+    interpret RepeatKeys_Enable {
+	action= LockControls(controls=RepeatKeys);
+    };
+
+    interpret SlowKeys_Enable {
+	action= LockControls(controls=SlowKeys);
+    };
+
+    interpret BounceKeys_Enable {
+	action= LockControls(controls=BounceKeys);
+    };
+
+    interpret StickyKeys_Enable {
+	action= LockControls(controls=StickyKeys);
+    };
+
+    interpret MouseKeys_Enable {
+	action= LockControls(controls=MouseKeys);
+    };
+
+    interpret MouseKeys_Accel_Enable {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+
+    interpret Overlay1_Enable {
+	action= LockControls(controls=Overlay1);
+    };
+
+    interpret Overlay2_Enable {
+	action= LockControls(controls=Overlay2);
+    };
+
+    interpret AudibleBell_Enable {
+	action= LockControls(controls=AudibleBell);
+    };
+};