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/rs | |
| 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/rs')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index baa7a345a..0a08c6211 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -5,7 +5,7 @@ // // Original authors: // Danilo Segan (Данило Шеган) <danilo@kvota.net> -// Chusslove Illich (Часлав Илић) <chaslav@sezampro.yu> +// Chusslove Illich (Часлав Илић) <caslav.ilic@gmx.net> // // Danilo Segan <danilo@kvota.net>: // - Modified for inclusion in XFree86 @@ -56,7 +56,7 @@ xkb_symbols "common" { key.type[Group1] = "FOUR_LEVEL"; - key <TLDE> { [ quoteleft, asciitilde, any,any ] }; // + key <TLDE> { [ grave, asciitilde, any,any ] }; // key <AE01> { [ 1, exclam, any,any ] }; // key <AE02> { [ 2, quotedbl, any,any ] }; // key <AE03> { [ 3, numbersign, any,any ] }; // |