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/sun_vndr/ca | |
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/sun_vndr/ca')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/sun_vndr/ca | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca index 114ef3a7a..7e5a666da 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca @@ -63,9 +63,9 @@ xkb_symbols "sun_type6" { key <AB01> { [ z, Z, guillemotleft ]}; key <AB02> { [ x, X, guillemotright ]}; key <AB07> { [ m, M, mu ]}; - key <AB08> { [ comma, quoteright, less ]}; + key <AB08> { [ comma, apostrophe, less ]}; key <AB09> { [ period, quotedbl, greater ]}; - key <AB10> { [ eacute, Eacute, quoteleft ]}; + key <AB10> { [ eacute, Eacute, grave ]}; include "level3(ralt_switch)" |