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/bd | |
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/bd')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/bd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd index 34879eb72..d4be36871 100644 --- a/xorg-server/xkeyboard-config/symbols/bd +++ b/xorg-server/xkeyboard-config/symbols/bd @@ -20,7 +20,7 @@ xkb_symbols "basic" { key <ESC> { [ Escape ] }; // numbers - key <TLDE> { [ quoteleft, asciitilde, voidsymbol, voidsymbol ] }; + key <TLDE> { [ grave, asciitilde, voidsymbol, voidsymbol ] }; key <AE01> { [ 0x10009E7, exclam, 0x10009F4, voidsymbol ] }; key <AE02> { [ 0x10009E8, at, 0x10009F5, voidsymbol ] }; key <AE03> { [ 0x10009E9, numbersign, 0x10009F6, voidsymbol ] }; @@ -63,7 +63,7 @@ xkb_symbols "basic" { key <AC08> { [ 0x10009A4, 0x10009A5, 0x10009CE, voidsymbol ] }; key <AC09> { [ 0x10009A6, 0x10009A7, 0x100098C, 0x10009E1 ] }; key <AC10> { [ semicolon, colon, voidsymbol, voidsymbol ] }; - key <AC11> { [ quoteright, quotedbl, voidsymbol, voidsymbol ] }; + key <AC11> { [ apostrophe, quotedbl, voidsymbol, voidsymbol ] }; // shift, z to / // key <LFSH> { [ Shift_L ] }; |