diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
| commit | 684eb992146cad24b690073f33b909f47150b841 (patch) | |
| tree | 7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /xorg-server/xkeyboard-config/rules | |
| parent | 53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff) | |
| parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
| download | vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2 vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.hdr.part | 15 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 19 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/xfree98 | 2 |
3 files changed, 24 insertions, 12 deletions
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)
|