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/symbols/jp | |
| 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/symbols/jp')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/jp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp index 52f574623..f0b2c4d75 100644 --- a/xorg-server/xkeyboard-config/symbols/jp +++ b/xorg-server/xkeyboard-config/symbols/jp @@ -243,8 +243,8 @@ xkb_symbols "nicola_f_bs" { // Copied from macintosh_vndr/jp partial alphanumeric_keys xkb_symbols "mac" { - name[Group1]= "Japanese (Macintosh)"; include "jp(kana)" + name[Group1]= "Japanese (Macintosh)"; replace key <CAPS> { [ Caps_Lock ] }; }; @@ -256,8 +256,8 @@ xkb_symbols "hztg_escape" { partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1]= "Japanese (Dvorak)"; include "jp(OADG109A)" + name[Group1]= "Japanese (Dvorak)"; key <AE11> { [ at, grave ] }; |