aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/rules/evdev.m_s.part
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-28 15:29:51 +0000
committermarha <marha@users.sourceforge.net>2010-03-28 15:29:51 +0000
commitc47c66de219162dd624593db5c5702f34539c7db (patch)
tree91a4a56726ed460718bd7077f05cd0339cfc0ad3 /xorg-server/xkbdata.src/rules/evdev.m_s.part
parentd335230702f56789a45c3f3ea8af0eefdcc8f6f4 (diff)
downloadvcxsrv-c47c66de219162dd624593db5c5702f34539c7db.tar.gz
vcxsrv-c47c66de219162dd624593db5c5702f34539c7db.tar.bz2
vcxsrv-c47c66de219162dd624593db5c5702f34539c7db.zip
svn merge -r507:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/evdev.m_s.part')
-rw-r--r--xorg-server/xkbdata.src/rules/evdev.m_s.part5
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/rules/evdev.m_s.part b/xorg-server/xkbdata.src/rules/evdev.m_s.part
index 516c976ad..1b423053c 100644
--- a/xorg-server/xkbdata.src/rules/evdev.m_s.part
+++ b/xorg-server/xkbdata.src/rules/evdev.m_s.part
@@ -1,2 +1,3 @@
- $evdevkbds = +inet(evdev)+inet(%m)
- * = +inet(evdev)
+ $evdevkbds = +inet(evdev)+inet(%m)
+ applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)
+ * = +inet(evdev)