diff options
author | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
commit | 6daf40f6b1138efad98dbb579cd35520cbc349bb (patch) | |
tree | 7f45dbb347f5e1a73b18a720633b9d801c968490 /xorg-server/xkeyboard-config/keycodes/xfree86 | |
parent | 5c64f94cf4cf8457a5616fe20b9a27174895f1a8 (diff) | |
parent | 982ac918afe6a1c02d5cf735d7b6c56443a048cc (diff) | |
download | vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.gz vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.bz2 vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014
Conflicts:
mesalib/src/glsl/glcpp/glcpp.c
openssl/Makefile
Diffstat (limited to 'xorg-server/xkeyboard-config/keycodes/xfree86')
-rw-r--r-- | xorg-server/xkeyboard-config/keycodes/xfree86 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/keycodes/xfree86 b/xorg-server/xkeyboard-config/keycodes/xfree86 index 0c910187f..47dc8934e 100644 --- a/xorg-server/xkeyboard-config/keycodes/xfree86 +++ b/xorg-server/xkeyboard-config/keycodes/xfree86 @@ -163,9 +163,7 @@ xkb_keycodes "basic" { // The entries commented out are never generated because the raw codes // in those positions are already used for well-defined keys. - alias <I01> = <XFER>; <I02> = 130; - alias <I03> = <NFER>; <I04> = 132; alias <I05> = <AE13>; <I06> = 134; @@ -287,7 +285,9 @@ xkb_keycodes "basic" { <I7A> = 250; <I7B> = 251; <I7C> = 252; + alias <IR7C> = <I7C>; <I7D> = 253; + alias <IR7D> = <I7D>; <I7E> = 254; <I7F> = 255; |