aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/compat/misc
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-11 16:16:53 +0000
committermarha <marha@users.sourceforge.net>2011-01-11 16:16:53 +0000
commit0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1 (patch)
tree4f8c031c94befa6d4fae71b04c9ce1fd41c783ae /xorg-server/xkeyboard-config/compat/misc
parent62e59b120f97d25c1ea72b01b10e63dab1ddaf34 (diff)
parent4613071e75e4828ce69ac1f17d73b0b7b6275578 (diff)
downloadvcxsrv-0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1.tar.gz
vcxsrv-0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1.tar.bz2
vcxsrv-0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/compat/misc')
-rw-r--r--xorg-server/xkeyboard-config/compat/misc2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/compat/misc b/xorg-server/xkeyboard-config/compat/misc
index 68cda9594..184fedc42 100644
--- a/xorg-server/xkeyboard-config/compat/misc
+++ b/xorg-server/xkeyboard-config/compat/misc
@@ -114,6 +114,8 @@ default partial xkb_compatibility "misc" {
};
include "ledscroll"
+
+ include "misc(assign_shift_left_action)"
};
partial xkb_compatibility "assign_shift_left_action" {