aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/base.xml.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-18 08:07:22 +0100
committermarha <marha@users.sourceforge.net>2011-11-18 08:07:22 +0100
commit7a750103eafc49dd7ee461b6f5efb41a93174056 (patch)
treec1aa773b5d5deba0396e041264fe6b1a8a8c6d18 /xorg-server/xkeyboard-config/rules/base.xml.in
parentc39504c06831cd3f0f702b9140d64a2bff1b7a62 (diff)
parent1d325f411302fb329f0045f1288fc7cba03b17ce (diff)
downloadvcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.tar.gz
vcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.tar.bz2
vcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/base.xml.in')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in7
1 files changed, 7 insertions, 0 deletions
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>