From feee2b5ceb37101bd1c4162e49805e6ad63e28ae Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 28 Feb 2011 06:37:03 +0000
Subject: xserver libX11 Xextproto mesa Git update 28 Feb 2011

---
 xorg-server/xkeyboard-config/rules/base.xml.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'xorg-server/xkeyboard-config/rules/base.xml.in')

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 3578100ee..ef97ab8d2 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1394,14 +1394,14 @@
         </variant>
         <variant>
           <configItem>
-            <name>olpc-fa</name>
+            <name>fa-olpc</name>
             <_description>OLPC Dari</_description>
             <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>olpc-uz</name>
+            <name>uz-olpc</name>
             <_description>OLPC Southern Uzbek</_description>
             <languageList><iso639Id>uzb</iso639Id></languageList>
           </configItem>
@@ -5295,6 +5295,12 @@
           <_description>Caps Lock is disabled</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>caps:ctrl_modifier</name>
+          <_description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="false">
       <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
-- 
cgit v1.2.3