diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
| commit | d53900c52abc2402f978b72278712e4bcdbde9f2 (patch) | |
| tree | 689cedc44df148a96d68ef460cff6b1756f096b6 /xorg-server/xkeyboard-config/symbols/xfree68_vndr | |
| parent | 36eb733ed5aaaeaefc49c8894bf213d16b58d242 (diff) | |
| parent | 2414a1de3cc17f438219f8f2a58b530d33e99a5e (diff) | |
| download | vcxsrv-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/xfree68_vndr')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga index e9d43ff60..46d48a27e 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga @@ -17,7 +17,7 @@ default xkb_symbols "usa1" { // End "Function" section // Alphanumeric section - key <TLDE> { [ quoteleft, asciitilde ] }; + key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; key <AE03> { [ 3, numbersign ] }; @@ -60,7 +60,7 @@ default xkb_symbols "usa1" { key <AC08> { [ k, K ] }; key <AC09> { [ l, L ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <LFSH> { [ Shift_L ] }; key <AB01> { [ z, Z ] }; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt index 813311dcf..65048bde4 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt @@ -16,7 +16,7 @@ default xkb_symbols "us" { key <AE10> { [ 0, parenright ] }; key <AE11> { [ minus, underscore ] }; key <AE12> { [ equal, plus ] }; - key <TLDE> { [ quoteleft, asciitilde ] }; + key <TLDE> { [ grave, asciitilde ] }; key <BKSP> { [ BackSpace ] }; key <TAB> { [ Tab, ISO_Left_Tab ] }; @@ -46,7 +46,7 @@ default xkb_symbols "us" { key <AC08> { [ k, K ] }; key <AC09> { [ l, L ] }; key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + key <AC11> { [ apostrophe, quotedbl ] }; key <BKSL> { [ backslash, bar ] }; key <LFSH> { [ Shift_L ] }; @@ -133,7 +133,7 @@ xkb_symbols "de" { key <AE09> { [ 9, parenright ] }; key <AE10> { [ 0, equal ] }; key <AE11> { [ ssharp, question ] }; - key <AE12> { [ quoteright, quoteleft ] }; + key <AE12> { [ apostrophe, grave ] }; key <TLDE> { [ numbersign, asciicircum ] }; key <AD06> { [ z, Z ] }; |