From fe6927d79e02d01cce20ecf56c8721fcadc2d278 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 31 Jan 2010 14:39:32 +0000
Subject: svn merge ^/branches/released

---
 xorg-server/xkbdata.src/symbols/pc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'xorg-server/xkbdata.src/symbols/pc')

diff --git a/xorg-server/xkbdata.src/symbols/pc b/xorg-server/xkbdata.src/symbols/pc
index 9f3da6640..a359b8023 100644
--- a/xorg-server/xkbdata.src/symbols/pc
+++ b/xorg-server/xkbdata.src/symbols/pc
@@ -32,13 +32,11 @@ xkb_symbols "pc105" {
     key <LCTL> {	[ Control_L	]	};
 
     key <LWIN> {	[ Super_L			]	};
-    modifier_map Mod4   { <LWIN> };
 
     key <RTSH> {	[ Shift_R	]	};
     key <RCTL> {	[ Control_R	]	};
 
     key <RWIN> {	[ Super_R			]	};
-    modifier_map Mod4   { <RWIN> };
 
     key <MENU> {	[ Menu			]	};
 
@@ -47,6 +45,7 @@ xkb_symbols "pc105" {
     modifier_map Lock   { Caps_Lock, ISO_Lock };
     modifier_map Control{ Control_L, Control_R };
     modifier_map Mod2   { Num_Lock };
+    modifier_map Mod4   { Super_L, Super_R };
 
     //  Fake keys for virtual<->real modifiers mapping 
     key <LVL3> {	[ ISO_Level3_Shift	]	};
-- 
cgit v1.2.3