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

diff --git a/xorg-server/xkeyboard-config/compat/level5 b/xorg-server/xkeyboard-config/compat/level5
index 69296e9f0..8d28051c1 100644
--- a/xorg-server/xkeyboard-config/compat/level5
+++ b/xorg-server/xkeyboard-config/compat/level5
@@ -1,51 +1,51 @@
-// Fairly complete set of symbol interpretations 

-// to provide reasonable default behavior

-

-default partial xkb_compatibility "default"  {

-    virtual_modifiers LevelFive;

-

-    interpret.repeat= False;

-    setMods.clearLocks= True;

-    latchMods.clearLocks= True;

-    latchMods.latchToLock= True;

-

-    interpret ISO_Level5_Shift+Any {

-	useModMapMods= level1;

-	virtualModifier= LevelFive;

-	action= SetMods(modifiers=LevelFive);

-    };

-

-    interpret ISO_Level5_Shift {

-	action= SetMods(modifiers=LevelFive);

-    };

-

-    interpret ISO_Level5_Latch+Any {

-	virtualModifier= LevelFive;

-	action= LatchMods(modifiers=LevelFive);

-    };

-

-    interpret ISO_Level5_Latch {

-	action= LatchMods(modifiers=LevelFive);

-    };

-

-    interpret ISO_Level5_Lock+Any {

-	virtualModifier= LevelFive;

-	action= LockMods(modifiers=LevelFive);

-    };

-

-    interpret ISO_Level5_Lock {

-	action= LockMods(modifiers=LevelFive);

-    };

-};

-partial xkb_compatibility "level5_lock"  {

-	// This defines a Level5-Lock using the NumLock real modifier in order to

-	// create arbitrary level-behaviour, which would not be possible with the

-	// virtual modifier.

-	// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK

-	// See also: symbols/level5(lock)

-    virtual_modifiers NumLock;

-    

-    interpret ISO_Level5_Lock {

-        action = LockMods(modifiers = NumLock);

-    };

-};

+// Fairly complete set of symbol interpretations 
+// to provide reasonable default behavior
+
+default partial xkb_compatibility "default"  {
+    virtual_modifiers LevelFive;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret ISO_Level5_Shift+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelFive;
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Shift {
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Latch+Any {
+	virtualModifier= LevelFive;
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Latch {
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Lock+Any {
+	virtualModifier= LevelFive;
+	action= LockMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Lock {
+	action= LockMods(modifiers=LevelFive);
+    };
+};
+partial xkb_compatibility "level5_lock"  {
+	// This defines a Level5-Lock using the NumLock real modifier in order to
+	// create arbitrary level-behaviour, which would not be possible with the
+	// virtual modifier.
+	// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
+	// See also: symbols/level5(lock)
+    virtual_modifiers NumLock;
+    
+    interpret ISO_Level5_Lock {
+        action = LockMods(modifiers = NumLock);
+    };
+};