aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols/macintosh_vndr
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-06 13:39:40 +0200
committermarha <marha@users.sourceforge.net>2013-09-06 13:39:40 +0200
commitd53900c52abc2402f978b72278712e4bcdbde9f2 (patch)
tree689cedc44df148a96d68ef460cff6b1756f096b6 /xorg-server/xkeyboard-config/symbols/macintosh_vndr
parent36eb733ed5aaaeaefc49c8894bf213d16b58d242 (diff)
parent2414a1de3cc17f438219f8f2a58b530d33e99a5e (diff)
downloadvcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.gz
vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.bz2
vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa pixman xserver xkeyboard-config Conflicts: xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/macintosh_vndr')
-rw-r--r--xorg-server/xkeyboard-config/symbols/macintosh_vndr/us4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
index 36f4429cc..d0cf5600b 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
@@ -6,7 +6,7 @@ xkb_symbols "extended" {
key <ESC> { [ Escape ] };
// Alphanumeric section
- key <TLDE> { [ quoteleft, asciitilde ] };
+ key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
key <AE03> { [ 3, numbersign ] };
@@ -44,7 +44,7 @@ xkb_symbols "extended" {
key <AC08> { [ k, K ] };
key <AC09> { [ l, L ] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
key <AB01> { [ z, Z ] };
key <AB02> { [ x, X ] };