From e22891346b85a7db40dec7260a100f90b451cbc8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 23 Dec 2011 10:01:52 +0100
Subject: git mesa pixman xserver xkeyboard-config update 24 dec 2011

---
 xorg-server/xkeyboard-config/rules/base.xml.in | 6 +++---
 xorg-server/xkeyboard-config/symbols/la        | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

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

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 47d160e30..7c94620ab 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -4192,7 +4192,7 @@
         <name>rs</name>
         <!-- Keyboard indicator for Serbian layouts -->
         <_shortDescription>sr</_shortDescription>
-        <_description>Serbian</_description>
+        <_description>Serbian (Cyrillic)</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
         </languageList>
@@ -4201,7 +4201,7 @@
         <variant>
           <configItem>
             <name>yz</name>
-            <_description>Serbian (Z and ZHE swapped)</_description>
+            <_description>Serbian (Cyrillic, Z and ZHE swapped)</_description>
           </configItem>
         </variant>
         <variant>
@@ -4231,7 +4231,7 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Serbian (with guillemets)</_description>
+            <_description>Serbian (Cyrillic with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index a174ddfcc..269cb2618 100644
--- a/xorg-server/xkeyboard-config/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
@@ -62,14 +62,6 @@ xkb_symbols "basic" {
     key <AB09> { [ 0x1000ec3,       dollar	]};
     key <AB10> { [ 0x1000e9d,       parenright	]};
 
-override key <LFSH> {
-	type[Group1]="PC_ALT_LEVEL2",
-	[ 	 Shift_L,		ISO_First_Group		]
-    };
-override key <RTSH> {
-	type[Group1]="PC_ALT_LEVEL2",
-	[ 	Shift_R,		ISO_Last_Group 		]
-    };
 };
 
 partial
-- 
cgit v1.2.3