diff options
| author | marha <marha@users.sourceforge.net> | 2013-04-08 08:20:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-04-08 08:20:47 +0200 |
| commit | a4505330e3469b6956348812ff2d6c24f812a8ba (patch) | |
| tree | cf2b88c771188580ab585f763d2e7a0309ecab26 /xorg-server/xkeyboard-config | |
| parent | 44fb3db38c5148666f62c78e10fc37bb20ed5c5c (diff) | |
| parent | 95fb19d661154ba8cfc6c793a0daa25657294b3b (diff) | |
| download | vcxsrv-a4505330e3469b6956348812ff2d6c24f812a8ba.tar.gz vcxsrv-a4505330e3469b6956348812ff2d6c24f812a8ba.tar.bz2 vcxsrv-a4505330e3469b6956348812ff2d6c24f812a8ba.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libXau mesa xserver xkeyboard-config git update 8 Apr 2013
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/gb | 3 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/md | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb index c7de8c33e..10372afcd 100644 --- a/xorg-server/xkeyboard-config/symbols/gb +++ b/xorg-server/xkeyboard-config/symbols/gb @@ -169,7 +169,8 @@ xkb_symbols "mac" { key <AE02> { [ 2, at, EuroSign ] }; key <AE03> { [ 3, sterling, numbersign ] }; - key <LSGT> { [ grave, asciitilde ] }; + key <TLDE> { [ section, plusminus ] }; + key <LSGT> { [ grave, asciitilde ] }; // End alphanumeric section diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb index a6bc48e8c..4e4248561 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb @@ -4,12 +4,14 @@ xkb_symbols "basic" { // Describes the differences between a very simple en_US // keyboard and a very simple U.K. keyboard layout - include "latin" + include "macintosh_vndr/us" name[Group1]= "United Kingdom - Mac"; key <AE02> { [ 2, at, EuroSign ] }; key <AE03> { [ 3, sterling, numbersign ] }; + key <TLDE> { [ section, plusminus ] }; + key <LSGT> { [ grave, asciitilde ] }; // End alphanumeric section diff --git a/xorg-server/xkeyboard-config/symbols/md b/xorg-server/xkeyboard-config/symbols/md index 848fe05a7..f7700e930 100644 --- a/xorg-server/xkeyboard-config/symbols/md +++ b/xorg-server/xkeyboard-config/symbols/md @@ -38,7 +38,7 @@ name[Group1]="Moldavian (Gagauz)"; // Alphanumeric section key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; - key <AE02> { [ 2, quotedb1, at ] }; + key <AE02> { [ 2, quotedbl, at ] }; key <AE03> { [ 3, numbersign ] }; key <AE04> { [ 4, semicolon, dollar ] }; key <AE05> { [ 5, percent, EuroSign, cent ] }; |