aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-13 11:42:04 +0200
committermarha <marha@users.sourceforge.net>2012-04-13 11:42:04 +0200
commitd2d4fd66a0c1fca50d07fce3f383d6a84a57f09a (patch)
treeb50ae20ca22bc564b145906d6c84395285933859 /xorg-server/xkeyboard-config
parent120bd371deb2b73a0bae5ce331511e4ea27bcff2 (diff)
parentfffd436e9c2ec6f5aa501ee57d0e4ade7293ee60 (diff)
downloadvcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.gz
vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.bz2
vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/symbols/de4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 13f5c8759..4a04cadae 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -319,7 +319,7 @@ xkb_symbols "neo_base" {
key <AB02> { [ odiaeresis, Odiaeresis, dollar, U03F5, Tab, Tab, intersection, NoSymbol ] };
key <AB03> { [ adiaeresis, Adiaeresis, bar, Greek_eta, Insert, Insert, U2135, NoSymbol ] };
key <AB04> { [ p, P, asciitilde, Greek_pi, Return, Return, Greek_PI, NoSymbol ] };
- key <AB05> { [ z, Z, grave, Greek_zeta, Undo, Undo, U2124, NoSymbol ] };
+ key <AB05> { [ z, Z, grave, Greek_zeta, Undo, Redo, U2124, NoSymbol ] };
key <AB06> { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] };
key <AB07> { [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ] };
@@ -344,7 +344,7 @@ xkb_symbols "neo_base" {
// Topmost row
// --------------------------------------------------------------
key <KPDV> { [ KP_Divide, KP_Divide, division, U2300, U2215, NoSymbol, U2223, NoSymbol ] };
- key <KPMU> { [ KP_Multiply, KP_Multiply, U2219, U2299, multiply, NoSymbol, U2297, NoSymbol ] };
+ key <KPMU> { [ KP_Multiply, KP_Multiply, U22C5, U2299, multiply, NoSymbol, U2297, NoSymbol ] };
key <KPSU> { [ KP_Subtract, KP_Subtract, U2212, U2296, U2216, NoSymbol, U2238, NoSymbol ] };
// Top row