From 8a191c08ddda2e66fa26f148d6c21959bb08f923 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 20 Feb 2011 12:29:25 +0000
Subject: xserver xkeyboard-config libX11 pixman mesa git update 2011

---
 xorg-server/xkeyboard-config/rules/base.hdr.part | 15 ++++++---------
 xorg-server/xkeyboard-config/rules/base.xml.in   | 19 ++++++++++++++++++-
 xorg-server/xkeyboard-config/rules/xfree98       |  2 --
 3 files changed, 24 insertions(+), 12 deletions(-)

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

diff --git a/xorg-server/xkeyboard-config/rules/base.hdr.part b/xorg-server/xkeyboard-config/rules/base.hdr.part
index d867c8876..6550f864d 100644
--- a/xorg-server/xkeyboard-config/rules/base.hdr.part
+++ b/xorg-server/xkeyboard-config/rules/base.hdr.part
@@ -1,9 +1,6 @@
-// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-//
-//  Rules for resolving XKB components for use with XFree86
-//  Copyright 1996 by Joseph Moss
-//
-//  2002 Modifier: Ivan Pascal      The XFree86 Project
-//  $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $
-//
+//
+//  Rules for resolving XKB components for use with XFree86
+//  Copyright 1996 by Joseph Moss
+//
+//  2002 Modifier: Ivan Pascal      The XFree86 Project
+//
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 6600d3bcb..919ed4b34 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3061,7 +3061,24 @@
         <_description>Laos</_description>
         <languageList><iso639Id>lao</iso639Id></languageList>
       </configItem>
-      <variantList/>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>basic</name>
+	    <_description>Laos</_description>
+            <languageList><iso639Id>lao</iso639Id>
+            </languageList>
+	  </configItem>
+	</variant>
+	<variant>
+	  <configItem>
+	    <name>stea</name>
+	    <_description>Laos - STEA (proposed standard layout)</_description>
+            <languageList><iso639Id>lao</iso639Id>
+            </languageList>
+	  </configItem>
+	</variant>
+      </variantList>
     </layout>
     <layout>
       <configItem>
diff --git a/xorg-server/xkeyboard-config/rules/xfree98 b/xorg-server/xkeyboard-config/rules/xfree98
index 4e16c6dc9..1196f7488 100644
--- a/xorg-server/xkeyboard-config/rules/xfree98
+++ b/xorg-server/xkeyboard-config/rules/xfree98
@@ -2,8 +2,6 @@
 //  Rules for resolving XKB components for use with XFree86
 //  Copyright 1996 by Joseph Moss
 //
-//  $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.5 1996/12/17 21:03:59 dawes Exp $
-//
 
 ! model 	=	keycodes	geometry
   pc98		=	xfree98(pc98)	nec(pc98)
-- 
cgit v1.2.3