diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
| commit | a16c0d6f73877af35ea0519917a82d5919e3c304 (patch) | |
| tree | b575998554afa00acc1086ff0a5ef17785c75326 /xorg-server/xkbdata.src/rules/base.ml_s.part | |
| parent | 0489d8cc5cc2f0bbdbee7aa2ed771ca0d42f30aa (diff) | |
| parent | ea63f0fae5c393ccf198aad0ae4dbda6d2a4391a (diff) | |
| download | vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.gz vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.bz2 vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/base.ml_s.part')
| -rw-r--r-- | xorg-server/xkbdata.src/rules/base.ml_s.part | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part index 570c5ef77..7e9b2d63e 100644 --- a/xorg-server/xkbdata.src/rules/base.ml_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml_s.part @@ -3,10 +3,10 @@ amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 amiga * = xfree68_vndr/amiga(usa1)+%l%(v) classmate us = pc+%l(classmate) - sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2 - sun4 * = latin+sun_vndr/us(sun4)+%l%(v) - sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2 - sun5 * = latin+sun_vndr/us(sun5)+%l%(v) + sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 + sun4 * = latin+sun_vndr/us(type4)+%l%(v) + sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 + sun5 * = latin+sun_vndr/us(type5)+%l%(v) sun6 us = sun_vndr/us(type6) sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) sun6 * = sun_vndr/us(type6)+%l%(v) @@ -20,6 +20,6 @@ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) - thinkpad br = pc+br(thinkpad) + $thinkpads br = pc+br(thinkpad) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) |