diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
| commit | ed474047e06f28fe740130f3bb13d3a40f4833a9 (patch) | |
| tree | 35a48f61c00ebb1f0579159c25dbbd1bfe812849 /xorg-server/xkeyboard-config/rules/base.xml.in | |
| parent | 3c0e16af61a9e0b6f9edab1d403adfaa85456599 (diff) | |
| parent | d4d629b77742e60caac3d120ff40e9f386380af2 (diff) | |
| download | vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.gz vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.bz2 vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013
Conflicts:
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMisc.c
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/base.xml.in')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 83dc894e2..95790dda8 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -6282,42 +6282,84 @@ </option> <option> <configItem> + <name>compose:lwin-altgr</name> + <_description>3rd level of Left Win</_description> + </configItem> + </option> + <option> + <configItem> <name>compose:rwin</name> <_description>Right Win</_description> </configItem> </option> <option> <configItem> + <name>compose:rwin-altgr</name> + <_description>3rd level of Right Win</_description> + </configItem> + </option> + <option> + <configItem> <name>compose:menu</name> <_description>Menu</_description> </configItem> </option> <option> <configItem> + <name>compose:menu-altgr</name> + <_description>3rd level of Menu</_description> + </configItem> + </option> + <option> + <configItem> <name>compose:lctrl</name> <_description>Left Ctrl</_description> </configItem> </option> <option> <configItem> + <name>compose:lctrl-altgr</name> + <_description>3rd level of Left Ctrl</_description> + </configItem> + </option> + <option> + <configItem> <name>compose:rctrl</name> <_description>Right Ctrl</_description> </configItem> </option> <option> <configItem> + <name>compose:rctrl-altgr</name> + <_description>3rd level of Right Ctrl</_description> + </configItem> + </option> + <option> + <configItem> <name>compose:caps</name> <_description>Caps Lock</_description> </configItem> </option> <option> <configItem> + <name>compose:caps-altgr</name> + <_description>3rd level of Caps Lock</_description> + </configItem> + </option> + <option> + <configItem> <name>compose:102</name> <_description><Less/Greater></_description> </configItem> </option> <option> <configItem> + <name>compose:102-altgr</name> + <_description>3rd level of <Less/Greater></_description> + </configItem> + </option> + <option> + <configItem> <name>compose:paus</name> <_description>Pause</_description> </configItem> |