diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
| commit | 097c0d8400d976c5c372db576a11764e87994c7f (patch) | |
| tree | b5f977f9277f70f94f22ef221602ed318592a912 /xorg-server/xkeyboard-config/rules | |
| parent | 03fa24f76277662240d0af8770e168fc38b533cb (diff) | |
| parent | 0e1ac54142d49051da9a74f37a792225a4e8d7b0 (diff) | |
| download | vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.gz vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.bz2 vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/specs/i18n/trans/trans.xml
mesalib/src/glsl/glsl_parser_extras.cpp
mesalib/src/glsl/ir_print_visitor.cpp
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/rules/xkb.dtd
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 7 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/xkb.dtd | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 7dbad7e8f..af564ff7b 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -627,6 +627,7 @@ <name>logii350</name>
<_description>Logitech Internet 350 Keyboard</_description>
<vendor>Logitech</vendor>
+ <hwList> <hwId>046d:c313</hwId></hwList>
</configItem>
</model>
<model>
@@ -3028,12 +3029,6 @@ </variant>
<variant>
<configItem>
- <name>qwerty</name>
- <_description>German (qwerty)</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
<name>ru</name>
<_description>Russian (Germany, phonetic)</_description>
<languageList>
diff --git a/xorg-server/xkeyboard-config/rules/xkb.dtd b/xorg-server/xkeyboard-config/rules/xkb.dtd index dcf35c947..be3434ab9 100644 --- a/xorg-server/xkeyboard-config/rules/xkb.dtd +++ b/xorg-server/xkeyboard-config/rules/xkb.dtd @@ -32,7 +32,7 @@ <!ELEMENT option (configItem)>
-<!ELEMENT configItem (name,shortDescription*,description*,vendor?,countryList?,languageList?)>
+<!ELEMENT configItem (name,shortDescription*,description*,vendor?,countryList?,languageList?,hwList?)>
<!ATTLIST configItem
popularity (standard|exotic) "standard">
@@ -53,3 +53,6 @@ <!ELEMENT iso639Id (#PCDATA)>
+<!ELEMENT hwList (hwId+)>
+
+<!ELEMENT hwId (#PCDATA)>
|