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/sharp_vndr/ws003sh | |
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/sharp_vndr/ws003sh')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh index 7c3d98fdf..575058ea7 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh @@ -11,7 +11,7 @@ xkb_symbols "basic" { key <AE04> { [ 4, dollar ] }; key <AE05> { [ 5, percent ] }; key <AE06> { [ 6, ampersand ] }; - key <AE07> { [ 7, quoteright, quoteleft ] }; + key <AE07> { [ 7, apostrophe, grave ] }; key <AE08> { [ 8, parenleft, braceleft ] }; key <AE09> { [ 9, parenright, braceright ] }; key <AE10> { [ 0 ] }; |