diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-28 15:29:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-28 15:29:51 +0000 |
| commit | c47c66de219162dd624593db5c5702f34539c7db (patch) | |
| tree | 91a4a56726ed460718bd7077f05cd0339cfc0ad3 /xorg-server/xkbdata.src/rules/base.ml_s.part | |
| parent | d335230702f56789a45c3f3ea8af0eefdcc8f6f4 (diff) | |
| download | vcxsrv-c47c66de219162dd624593db5c5702f34539c7db.tar.gz vcxsrv-c47c66de219162dd624593db5c5702f34539c7db.tar.bz2 vcxsrv-c47c66de219162dd624593db5c5702f34539c7db.zip | |
svn merge -r507:HEAD ^/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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part index 2f1aff506..d59c54f26 100644 --- a/xorg-server/xkbdata.src/rules/base.ml_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml_s.part @@ -23,6 +23,10 @@ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
+ applealu_jis jp = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2
+ applealu_jis * = macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2
+ $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v)
+ $applealu * = macintosh_vndr/apple(alukbd)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended)
$macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
nokiarx44 * = nokia_vndr/rx-44(%l)
|