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/fi | |
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/fi')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/sun_vndr/fi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi index 13e822c8f..c1ac1176a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi @@ -52,7 +52,7 @@ xkb_symbols "sun_type6" { key <AD12> { [ dead_diaeresis, asciicircum, asciitilde ] }; key <AC10> { [ odiaeresis, Odiaeresis ] }; key <AC11> { [ adiaeresis, Adiaeresis ] }; - key <BKSL> { [ apostrophe, asterisk, quoteleft ] }; + key <BKSL> { [ apostrophe, asterisk, grave ] }; key <LSGT> { [ less, greater, bar ] }; key <AB08> { [ comma, semicolon ] }; key <AB09> { [ period, colon ] }; |