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.ml1_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.ml1_s.part')
-rw-r--r-- | xorg-server/xkbdata.src/rules/base.ml1_s.part | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part index 8e0eeef4f..c45b9805e 100644 --- a/xorg-server/xkbdata.src/rules/base.ml1_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part @@ -6,5 +6,5 @@ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) - thinkpad br = pc+%l[1](thinkpad) + $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) |