diff options
author | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
commit | a27ca45b676116ebbce31973bc1a319cad76ffbf (patch) | |
tree | 098711ced704936739bc91abbd75942a815d89db /xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part | |
parent | 0b89941658d6117d17555ee28c6e5d7715673705 (diff) | |
parent | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff) | |
download | vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.gz vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.bz2 vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part')
-rw-r--r-- | xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part index b7d6e309a..28fb80b8a 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part @@ -1,2 +1,3 @@ de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 + de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 jp $sun_compat = +complete+japan(kana_lock):2 |