diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-11 16:16:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-11 16:16:53 +0000 |
| commit | 0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1 (patch) | |
| tree | 4f8c031c94befa6d4fae71b04c9ce1fd41c783ae /xorg-server/xkeyboard-config/compat | |
| parent | 62e59b120f97d25c1ea72b01b10e63dab1ddaf34 (diff) | |
| parent | 4613071e75e4828ce69ac1f17d73b0b7b6275578 (diff) | |
| download | vcxsrv-0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1.tar.gz vcxsrv-0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1.tar.bz2 vcxsrv-0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/compat')
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/complete | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/default.in | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/misc | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/compat/complete b/xorg-server/xkeyboard-config/compat/complete index dd49a5c43..cd8d059a7 100644 --- a/xorg-server/xkeyboard-config/compat/complete +++ b/xorg-server/xkeyboard-config/compat/complete @@ -8,5 +8,6 @@ default xkb_compatibility "complete" { augment "misc" augment "xfree86" augment "level5" + augment "caps(caps_lock)" }; diff --git a/xorg-server/xkeyboard-config/compat/default.in b/xorg-server/xkeyboard-config/compat/default.in index 5355e1318..090793fd7 100644 --- a/xorg-server/xkeyboard-config/compat/default.in +++ b/xorg-server/xkeyboard-config/compat/default.in @@ -10,4 +10,5 @@ default xkb_compatibility "default" { // ??should be changed/renamed/removed // augment "xfree86" augment "japan" + augment "caps(caps_lock)" }; 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" { |