diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-18 08:07:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-18 08:07:22 +0100 |
| commit | 7a750103eafc49dd7ee461b6f5efb41a93174056 (patch) | |
| tree | c1aa773b5d5deba0396e041264fe6b1a8a8c6d18 /xorg-server/xkeyboard-config/rules | |
| parent | c39504c06831cd3f0f702b9140d64a2bff1b7a62 (diff) | |
| parent | 1d325f411302fb329f0045f1288fc7cba03b17ce (diff) | |
| download | vcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.tar.gz vcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.tar.bz2 vcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.o_s.part | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index 6cf9f1406..e1188ba34 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.o_s.part @@ -103,6 +103,7 @@ nbsp:level4n = +nbsp(level4n) nbsp:level4nl = +nbsp(level4nl) japan:nicola_f_bs = +jp(nicola_f_bs) + japan:hztg_escape = +jp(hztg_escape) kpdl:dot = +kpdl(dot) kpdl:comma = +kpdl(comma) kpdl:dotoss = +kpdl(dotoss) diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 5279521a6..8816034a3 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -4779,6 +4779,7 @@ <_description>Taiwanese</_description> <languageList> <iso639Id>trv</iso639Id> + <iso639Id>pwn</iso639Id> </languageList> </configItem> <variantList> @@ -6498,6 +6499,12 @@ <_description>NICOLA-F style Backspace</_description> </configItem> </option> + <option> + <configItem> + <name>japan:hztg_escape</name> + <_description>Make Zenkaku Hankaku an additional ESC</_description> + </configItem> + </option> </group> <group allowMultipleSelection="false"> <configItem> |