diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
| commit | 684eb992146cad24b690073f33b909f47150b841 (patch) | |
| tree | 7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /xorg-server/xkeyboard-config/keymap/macintosh | |
| parent | 53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff) | |
| parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
| download | vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2 vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/keymap/macintosh')
| -rw-r--r-- | xorg-server/xkeyboard-config/keymap/macintosh | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/xorg-server/xkeyboard-config/keymap/macintosh b/xorg-server/xkeyboard-config/keymap/macintosh index de115badc..345667054 100644 --- a/xorg-server/xkeyboard-config/keymap/macintosh +++ b/xorg-server/xkeyboard-config/keymap/macintosh @@ -1,17 +1,15 @@ -// $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $ -// $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.1 1999/05/23 05:27:51 dawes Exp $ -default xkb_keymap "macintosh" { - xkb_keycodes { include "macintosh" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "macintosh_vndr/us(extended)" }; - xkb_geometry { include "macintosh" }; -}; - -xkb_keymap "macintosh_old" { - xkb_keycodes { include "macintosh(old)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "macintosh_vndr/us(extended)" }; - xkb_geometry { include "macintosh" }; -}; +default xkb_keymap "macintosh" {
+ xkb_keycodes { include "macintosh" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "macintosh_vndr/us(extended)" };
+ xkb_geometry { include "macintosh" };
+};
+
+xkb_keymap "macintosh_old" {
+ xkb_keycodes { include "macintosh(old)" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "macintosh_vndr/us(extended)" };
+ xkb_geometry { include "macintosh" };
+};
|