diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
| commit | 1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch) | |
| tree | 13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /xorg-server/xkeyboard-config/rules | |
| parent | baf98f9bb36f956245d83ecd04f90625d6d68d2b (diff) | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2 vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/os.h
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 6814a6b72..5279521a6 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -6209,7 +6209,7 @@ <option> <configItem> <name>numpad:mac</name> - <_description>Numeric keypad keys work as with Macintosh</_description> + <_description>Numeric keypad keys always enter digits (as in Mac OS)</_description> </configItem> </option> <option> @@ -6339,6 +6339,7 @@ <_description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> </configItem> </option> +<!-- <option> <configItem> <name>lv5:lsgt_switch_lock_cancel</name> @@ -6375,6 +6376,7 @@ <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> </configItem> </option> +--> </group> <group allowMultipleSelection="false"> <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level --> |