diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
| commit | 26dfcdba6c306d6312c598e4191449302329be68 (patch) | |
| tree | 2bf56b5a0eb2cc554833fdc6e08f2b59f1bfdabd /xorg-server/xkeyboard-config/rules | |
| parent | 2dc2880eacae3d52f4ab4bb5ec43c5bbf50c5c3f (diff) | |
| parent | ae06feae7876db47ff0e1fde40cf4a324a412037 (diff) | |
| download | vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.gz vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.bz2 vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/imports.h
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.o_s.part | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index a31556b55..e31ab64e4 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.o_s.part @@ -22,6 +22,7 @@ grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) + grp:win_space_toggle = +group(win_space_toggle) grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) grp:alt_space_toggle = +group(alt_space_toggle) diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 59b03c338..3b32e2209 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -5874,6 +5874,12 @@ </option> <option> <configItem> + <name>grp:win_space_toggle</name> + <_description>Win Key+Space</_description> + </configItem> + </option> + <option> + <configItem> <name>grp:rwin_toggle</name> <_description>Right Win</_description> </configItem> |