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

diff --git a/xorg-server/xkeyboard-config/compat/caps b/xorg-server/xkeyboard-config/compat/caps
index d787ab63d..03c47151e 100644
--- a/xorg-server/xkeyboard-config/compat/caps
+++ b/xorg-server/xkeyboard-config/compat/caps
@@ -1,12 +1,12 @@
-partial xkb_compatibility "caps_lock"  {
-    // Keysym Caps_Lock locks Lock modifier.
-    // With this, the keysym Caps_Lock can be used without binding the whole
-    // key to a real modifier.
-	// This is essential when you don't want to use caps lock on the first
-	// level.
-	// This should not have any compatibility issues when used together with
-	// other layouts which don't utilize this capability.
-    interpret Caps_Lock {
-        action = LockMods(modifiers = Lock);
-    };
-};
+partial xkb_compatibility "caps_lock"  {

+    // Keysym Caps_Lock locks Lock modifier.

+    // With this, the keysym Caps_Lock can be used without binding the whole

+    // key to a real modifier.

+	// This is essential when you don't want to use caps lock on the first

+	// level.

+	// This should not have any compatibility issues when used together with

+	// other layouts which don't utilize this capability.

+    interpret Caps_Lock {

+        action = LockMods(modifiers = Lock);

+    };

+};