diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-28 21:21:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-28 21:21:07 +0000 |
| commit | e85e0b6942e6eb9447fcf6c9a5045ba813aa6844 (patch) | |
| tree | 1fc646212f66bdf6449fe23b8a47813114095600 /xorg-server/xkbdata.src/rules/base.m_k.part | |
| parent | fedd99993946dd8fc22b60e3611e447f3b8092ca (diff) | |
| parent | 9370f043060a1d08bb51484a58c52db85a4ea656 (diff) | |
| download | vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.tar.gz vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.tar.bz2 vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.zip | |
svn merge ^/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, 16 insertions, 15 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part index dd0c391d6..88f9d96f0 100644 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ b/xorg-server/xkbdata.src/rules/base.m_k.part @@ -1,15 +1,16 @@ - amiga = amiga(de) - ataritt = ataritt(de) - 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 - 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)
+ evdev = evdev
+ $nokiamodels = evdev
+ olpc = evdev
+ macintosh_hhk = macintosh(hhk)
+ macintosh_old = macintosh(old)
+ $macs = macintosh
+ thinkpadz60 = xfree86(thinkpadz60)
+ * = xfree86
|