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

diff --git a/xorg-server/xkeyboard-config/compat/misc b/xorg-server/xkeyboard-config/compat/misc
index 6a8b20217..cfe9a39b4 100644
--- a/xorg-server/xkeyboard-config/compat/misc
+++ b/xorg-server/xkeyboard-config/compat/misc
@@ -1,122 +1,122 @@
-default partial xkb_compatibility "misc"  {

-

-    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;

-

-    // Interpretations for some other useful keys

-

-    interpret Terminate_Server {

-        action = Terminate();

-    };

-

-    setMods.clearLocks= True;

-

-    // Sets the "Alt" virtual modifier

-

-    interpret Alt_L+Any     {

-        //useModMapMods= level1;

-	virtualModifier= Alt;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Alt_L	{

-	action = SetMods(modifiers=Alt);

-    };

-

-    interpret Alt_R+Any     {

-        //useModMapMods= level1;

-	virtualModifier= Alt;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Alt_R	{

-	action = SetMods(modifiers=Alt);

-    };

-

-    // Sets the "Meta" virtual modifier

-

-    interpret Meta_L+Any     {

-//        useModMapMods= level1;

-	virtualModifier= Meta;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Meta_L	{

-	action = SetMods(modifiers=Meta);

-    };

-

-    interpret Meta_R+Any     {

-        //useModMapMods= level1;

-	virtualModifier= Meta;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Meta_R	{

-	action = SetMods(modifiers=Meta);

-    };

-

-    // Sets the "Super" virtual modifier

-

-    interpret Super_L+Any     {

-//        useModMapMods= level1;

-	virtualModifier= Super;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Super_L	{

-	action = SetMods(modifiers=Super);

-    };

-

-    interpret Super_R+Any     {

-        //useModMapMods= level1;

-	virtualModifier= Super;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Super_R	{

-	action = SetMods(modifiers=Super);

-    };

-

-    // Sets the "Hyper" virtual modifier

-

-    interpret Hyper_L+Any     {

-//        useModMapMods= level1;

-	virtualModifier= Hyper;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Hyper_L	{

-	action = SetMods(modifiers=Hyper);

-    };

-

-    interpret Hyper_R+Any     {

-        //useModMapMods= level1;

-	virtualModifier= Hyper;

-	action = SetMods(modifiers=modMapMods);

-    };

-

-    interpret Hyper_R	{

-	action = SetMods(modifiers=Hyper);

-    };

-

-    // Sets the "ScrollLock" virtual modifier and

-    // makes it actually lock when pressed.  Sets

-    // up a map for the scroll lock indicator.

-    interpret Scroll_Lock+Any	{

-	virtualModifier= ScrollLock;

-	action = LockMods(modifiers=modMapMods);

-    };

-

-    include "ledscroll"

-	

-    include "misc(assign_shift_left_action)"

-};

-

-partial xkb_compatibility "assign_shift_left_action"  {

-    // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is 

-    // getting bound to the Lock modifier when using 

-    // symbols/shift(both_capslock), creating unwanted behaviour. 

-    // This is a quirk, to circumvent the problem.

-    interpret Shift_L {

-        action = SetMods(modifiers = Shift);

-    };

-};

+default partial xkb_compatibility "misc"  {
+
+    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;
+
+    // Interpretations for some other useful keys
+
+    interpret Terminate_Server {
+        action = Terminate();
+    };
+
+    setMods.clearLocks= True;
+
+    // Sets the "Alt" virtual modifier
+
+    interpret Alt_L+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_L	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    interpret Alt_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_R	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    // Sets the "Meta" virtual modifier
+
+    interpret Meta_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_L	{
+	action = SetMods(modifiers=Meta);
+    };
+
+    interpret Meta_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_R	{
+	action = SetMods(modifiers=Meta);
+    };
+
+    // Sets the "Super" virtual modifier
+
+    interpret Super_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_L	{
+	action = SetMods(modifiers=Super);
+    };
+
+    interpret Super_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_R	{
+	action = SetMods(modifiers=Super);
+    };
+
+    // Sets the "Hyper" virtual modifier
+
+    interpret Hyper_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_L	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    interpret Hyper_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_R	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    // Sets the "ScrollLock" virtual modifier and
+    // makes it actually lock when pressed.  Sets
+    // up a map for the scroll lock indicator.
+    interpret Scroll_Lock+Any	{
+	virtualModifier= ScrollLock;
+	action = LockMods(modifiers=modMapMods);
+    };
+
+    include "ledscroll"
+	
+    include "misc(assign_shift_left_action)"
+};
+
+partial xkb_compatibility "assign_shift_left_action"  {
+    // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is 
+    // getting bound to the Lock modifier when using 
+    // symbols/shift(both_capslock), creating unwanted behaviour. 
+    // This is a quirk, to circumvent the problem.
+    interpret Shift_L {
+        action = SetMods(modifiers = Shift);
+    };
+};