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.m_k.part | |
| 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.m_k.part')
| -rw-r--r-- | xorg-server/xkbdata.src/rules/base.m_k.part | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part index 25a598b30..2c621208f 100644 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ b/xorg-server/xkbdata.src/rules/base.m_k.part @@ -1,17 +1,14 @@ - amiga = amiga(de)
- ataritt = ataritt(de)
- empty = empty
- sun4 = sun(type4_euro)
- sun5 = sun(type5_euro)
- sun6 = sun(type6_usb)
- sun6euro = sun(type6tuv_usb)
- pc98 = xfree98(pc98)
- evdev = evdev
- $nokiamodels = evdev
- olpc = evdev
- $applealu = macintosh(alukbd)
- macintosh_hhk = macintosh(hhk)
- macintosh_old = macintosh(old)
- $macs = macintosh
- thinkpadz60 = xfree86(thinkpadz60)
- * = xfree86
+ amiga = amiga(de) + ataritt = ataritt(de) + empty = empty + sun4 = sun(type4_euro) + sun5 = sun(type5_euro) + sun6 = sun(type6_usb) + sun6euro = sun(type6tuv_usb) + pc98 = xfree98(pc98) + $applealu = macintosh(alukbd) + macintosh_hhk = macintosh(hhk) + macintosh_old = macintosh(old) + $macs = macintosh + thinkpadz60 = xfree86(thinkpadz60) + * = xfree86 |