aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/base.xml.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-19 10:34:59 +0000
committermarha <marha@users.sourceforge.net>2010-11-19 10:34:59 +0000
commitb41a5d529c8208ebb68fd39f25ec368816ca0f00 (patch)
treea392621a6300b1434d26fdbd43e15286bdc21c6b /xorg-server/xkeyboard-config/rules/base.xml.in
parentf586b49ae23c573681b939ca44b3f418c83c84b2 (diff)
parent0b67cceb98ba4ab7b5cdaf9d6e9583d3c53802ea (diff)
downloadvcxsrv-b41a5d529c8208ebb68fd39f25ec368816ca0f00.tar.gz
vcxsrv-b41a5d529c8208ebb68fd39f25ec368816ca0f00.tar.bz2
vcxsrv-b41a5d529c8208ebb68fd39f25ec368816ca0f00.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/base.xml.in')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 27cf6e6ff..d9faa2d87 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -4994,6 +4994,12 @@
</option>
<option>
<configItem>
+ <name>ctrl:lctrl_meta</name>
+ <_description>Meta on Left Ctrl</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>ctrl:swapcaps</name>
<_description>Swap Ctrl and Caps Lock</_description>
</configItem>