diff options
author | marha <marha@users.sourceforge.net> | 2009-09-20 20:25:03 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-09-20 20:25:03 +0000 |
commit | 6341b97eda007223acfe2f7a64dc2c5718867e0a (patch) | |
tree | 1793a3e7cda31b9455df3106b60cc01a096b43f7 /xorg-server/xkbdata.src/rules/base.ml1_s.part | |
parent | 650fd857a97752ff5ff8b1654ec78b813b78d9c2 (diff) | |
parent | f3d88db0960f1c23e55f2529764b096ac92d78d9 (diff) | |
download | vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.gz vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.bz2 vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.zip |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/base.ml1_s.part')
-rw-r--r-- | xorg-server/xkbdata.src/rules/base.ml1_s.part | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part index c45b9805e..6a0787d21 100644 --- a/xorg-server/xkbdata.src/rules/base.ml1_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part @@ -1,7 +1,7 @@ ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) - sun4 * = latin+sun_vndr/us(sun4)+%l[1]%(v[1]) - sun5 * = latin+sun_vndr/us(sun5)+%l[1]%(v[1]) + sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) + sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) |