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 | |
| 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')
7 files changed, 26 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index dd7339390..9107c03f2 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -120,6 +120,12 @@ <_description>German (Sun Type 6/7)</_description> </configItem> </variant> + <variant> + <configItem> + <name>adnw</name> + <_description>German (Aus der Neo-Welt)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -689,6 +695,12 @@ <variantList> <variant> <configItem> + <name>dvorak_a5</name> + <_description>Swedish (Dvorak A5)</_description> + </configItem> + </variant> + <variant> + <configItem> <name>sun_type6</name> <_description>Swedish (Sun Type 6/7)</_description> </configItem> diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 3b32e2209..0b0c1482c 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1584,7 +1584,14 @@ <iso639Id>alb</iso639Id> </languageList> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>plisi-d1</name> + <_description>Albanian (Plisi D1)</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -6604,7 +6611,7 @@ </option> <option> <configItem> - <name>grab:debug_actions</name> + <name>grab:debug</name> <_description>Allow grab and window tree logging</_description> </configItem> </option> diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part index 9d274dff1..9e2158767 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part @@ -1,2 +1,3 @@ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp $sun_compat = complete+japan(kana_lock) 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 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part index 360b4c425..db62b75e1 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part @@ -1,2 +1,3 @@ de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 + de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 jp $sun_compat = +complete+japan(kana_lock):3 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part index 6633312c2..1df202f99 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part @@ -1,2 +1,3 @@ de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 + de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 jp $sun_compat = +complete+japan(kana_lock):4 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part index 927ff06b2..45b94b422 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part @@ -1,2 +1,3 @@ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp $sun_compat = complete+japan(kana_lock) |