diff options
author | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
commit | 3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064 (patch) | |
tree | b5487ebc7c6056e0b248afc471edf40b90a3b0b4 /xorg-server/xkeyboard-config/symbols/xfree68_vndr | |
parent | 1245204b2091d108a8688ff7f749f2c6cc830381 (diff) | |
parent | a12cf779e828ec70da714832e1eaa730119fe10c (diff) | |
download | vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.gz vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.bz2 vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/xfree68_vndr')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga | 3 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga index 46d48a27e..f785288bb 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga @@ -113,10 +113,9 @@ default xkb_symbols "usa1" { key <KP0> { [ KP_0, KP_Insert ] }; key <KPDC> { [ KP_Decimal, KP_Delete ] }; - key <KPEN> { [ KP_Enter ] }; + key <KPEN> { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt index 65048bde4..0ceb3ed13 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt @@ -1,6 +1,7 @@ default xkb_symbols "us" { name[Group1]= "US/ASCII"; + key <ESC> { [ Escape ] }; // Alphanumeric section @@ -112,7 +113,6 @@ default xkb_symbols "us" { key <KPEN> { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; @@ -124,7 +124,6 @@ xkb_symbols "de" { name[Group1]= "German"; - // Alphanumeric section key <AE02> { [ 2, quotedbl ] }; key <AE03> { [ 3, section ] }; key <AE06> { [ 6, ampersand ] }; |