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/nl | |
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/nl')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/sun_vndr/nl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl index 8f7a69de0..6d59bc2f4 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl @@ -44,7 +44,7 @@ xkb_symbols "sun_type6" { key <AE07> { [ 7, underscore, sterling ] }; key <AE08> { [ 8, parenleft, braceleft ] }; key <AE09> { [ 9, parenright, braceright ] }; - key <AE10> { [ 0, quoteright, quoteleft ] }; + key <AE10> { [ 0, apostrophe, grave ] }; key <AE11> { [ slash, question, backslash ] }; key <AE12> { [ degree, dead_tilde, dead_cedilla ] }; |