From a2ce004b2966da2fe0249e72e2fb99255cef3092 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 11 Mar 2013 09:17:45 +0100
Subject: fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11
 Mar 2013

xserver          commit 5047810a4c20fab444b8c6eb146c55dcdb0d4219
xkeyboard-config commit 2ed85c1e936f7cd4a9540ace5c12b9fec60ee1fb
libX11           commit 3996543c1b2919e97d61a5d70fe1ebd7cd76fc83
pixman           commit aaae3d8eefa069098e9014822817ca1429fdea46
fontconfig       commit bdf1581e3de5528f397f19bfd4ca9caaf9e7fe4a
mesa             commit b21a9d46e4be0c666327569f07b9cddeb4d42d38
---
 xorg-server/xkeyboard-config/rules/base.o_s.part | 1 +
 xorg-server/xkeyboard-config/rules/base.xml.in   | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'xorg-server/xkeyboard-config/rules')

diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 721291985..46c07b01d 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -1,5 +1,6 @@
   altwin:menu		=	+altwin(menu)
   altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:alt_win	=	+altwin(alt_win)
   altwin:ctrl_win	=	+altwin(ctrl_win)
   altwin:ctrl_alt_win	=	+altwin(ctrl_alt_win)
   altwin:meta_win	=	+altwin(meta_win)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 95790dda8..1d346238e 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -6219,6 +6219,12 @@
           <_description>Alt and Meta are on Alt keys</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>altwin:alt_win</name>
+          <_description>Alt is mapped to Win keys (and the usual Alt keys)</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>altwin:ctrl_win</name>
-- 
cgit v1.2.3