aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/base.xml.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-20 09:41:09 +0100
committermarha <marha@users.sourceforge.net>2012-01-20 09:41:09 +0100
commitc5f912c7b9248440bf9dff4b3c64513ec0f3ec98 (patch)
tree7986b288489dac6a8a70787dbdedfc0c064a0c02 /xorg-server/xkeyboard-config/rules/base.xml.in
parent27bec2ba601ec12334e6b7564034f87ab7c9522b (diff)
parenta8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 (diff)
downloadvcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.gz
vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.bz2
vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.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.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 22b720f20..6c17faaf7 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -6278,6 +6278,12 @@
<_description>Toggle PointerKeys with Shift + NumLock.</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>grab:break_actions</name>
+ <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="true">
<!-- Special shortcuts for the Euro character -->