diff options
author | marha <marha@users.sourceforge.net> | 2010-04-23 12:38:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-23 12:38:37 +0000 |
commit | f49a8c2a1f02f8089d709ec8dcf7080c041baf0c (patch) | |
tree | f501563b12b71a30bec36a3e93c50f677faa90f1 /xorg-server/xkbdata.src/rules/base.xml.in | |
parent | 2446c474aae15bcaf31e4b799f94f21d515984d5 (diff) | |
download | vcxsrv-f49a8c2a1f02f8089d709ec8dcf7080c041baf0c.tar.gz vcxsrv-f49a8c2a1f02f8089d709ec8dcf7080c041baf0c.tar.bz2 vcxsrv-f49a8c2a1f02f8089d709ec8dcf7080c041baf0c.zip |
svn merge -r544:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/base.xml.in')
-rw-r--r-- | xorg-server/xkbdata.src/rules/base.xml.in | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index d588790d6..e5f02f871 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -123,13 +123,6 @@ </model> <model> <configItem> - <name>acpi</name> - <_description>ACPI Standard</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>azonaRF2300</name> <_description>Azona RF2300 wireless Internet Keyboard</_description> <vendor>Azona</vendor> @@ -1135,13 +1128,6 @@ </model> <model> <configItem> - <name>evdev</name> - <_description>Evdev-managed keyboard</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>benqx</name> <_description>BenQ X-Touch</_description> <vendor>BenQ</vendor> |