Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 mesa xkeyboard-config mesa git update 1 Oct 2013

1 files changed, 13 insertions, 13 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5
index 84507e5b3..c4c760fcf 100644
--- a/xorg-server/xkeyboard-config/symbols/level5
+++ b/xorg-server/xkeyboard-config/symbols/level5
@@ -1,23 +1,13 @@
 // These partial variants assign ISO_Level5_Shift to various XKB keycodes
 // so that the fifth shift level can be reached.
 
-// Ensure a mapping to a real modifier for LevelFive.
-partial modifier_keys
-xkb_symbols "modifier_mapping" {
-  key.type[Group1] = "ONE_LEVEL";
-  replace key <MDSW> {
-    symbols[Group1] = [ ISO_Level5_Shift ]
-  };
-  modifier_map Mod3 { <MDSW> };
-};
-
 // The right Ctrl key (while pressed) chooses the fifth shift level.
 partial modifier_keys
 xkb_symbols "rctrl_switch" {
   key <RCTL> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
@@ -27,7 +17,7 @@ xkb_symbols "lsgt_switch" {
   key <LSGT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
@@ -37,10 +27,20 @@ xkb_symbols "ralt_switch" {
   key <RALT> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level5_Shift ]
-    };
+  };
   include "level5(modifier_mapping)"
 };
 
+// Ensure a mapping to a real modifier for LevelFive.
+partial modifier_keys
+xkb_symbols "modifier_mapping" {
+  replace key <MDSW> {
+    type[Group1] = "ONE_LEVEL";
+    symbols[Group1] = [ ISO_Level5_Shift ]
+  };
+  modifier_map Mod3 { <MDSW> };
+};
+
 
 // This adds the definitions needed to create a level5-lock behaviour, using
 // the real modifier NumLock as a lock indicator.