aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/rules/base.o_s.part
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-06 07:51:35 +0000
committermarha <marha@users.sourceforge.net>2010-05-06 07:51:35 +0000
commit118898c84d3dfea814d7f58a08cd4ee4d8123731 (patch)
treed6c528aa9ee55beca5a8787e6041742f0930246c /xorg-server/xkbdata.src/rules/base.o_s.part
parent0874ae23a16946781dd517cfdb011c691ad0b581 (diff)
downloadvcxsrv-118898c84d3dfea814d7f58a08cd4ee4d8123731.tar.gz
vcxsrv-118898c84d3dfea814d7f58a08cd4ee4d8123731.tar.bz2
vcxsrv-118898c84d3dfea814d7f58a08cd4ee4d8123731.zip
svn merge -r575:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/base.o_s.part')
-rw-r--r--xorg-server/xkbdata.src/rules/base.o_s.part16
1 files changed, 16 insertions, 0 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part
index 79f61d959..9958f101d 100644
--- a/xorg-server/xkbdata.src/rules/base.o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.o_s.part
@@ -113,9 +113,25 @@
shift:both_capslock = +shift(both_capslock)
shift:lshift_both_capslock = +shift(lshift_both_capslock)
shift:rshift_both_capslock = +shift(rshift_both_capslock)
+ shift:both_capslock_cancel = +shift(both_capslock_cancel)
+ shift:lshift_both_capslock_cancel = +shift(lshift_both_capslock_cancel)
+ shift:rshift_both_capslock_cancel = +shift(rshift_both_capslock_cancel)
+ shift:both_shiftlock = +shift(both_shiftlock)
+ shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock)
+ shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock)
lv3:caps_switch = +level3(caps_switch)
lv3:bksl_switch = +level3(bksl_switch)
+ lv3:lsgt_switch = +level3(lsgt_switch)
+ lv3:caps_switch_latch = +level3(caps_switch_latch)
+ lv3:bksl_switch_latch = +level3(bksl_switch_latch)
+ lv3:lsgt_switch_latch = +level3(lsgt_switch_latch)
lv5:lsgt_switch_lock = +level5(lsgt_switch_lock)
lv5:ralt_switch_lock = +level5(ralt_switch_lock)
+ lv5:lwin_switch_lock = +level5(lwin_switch_lock)
+ lv5:rwin_switch_lock = +level5(rwin_switch_lock)
+ lv5:lsgt_switch_lock_cancel = +level5(lsgt_switch_lock_cancel)
+ lv5:ralt_switch_lock_cancel = +level5(ralt_switch_lock_cancel)
+ lv5:lwin_switch_lock_cancel = +level5(lwin_switch_lock_cancel)
+ lv5:rwin_switch_lock_cancel = +level5(rwin_switch_lock_cancel)