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/amiga | |
| 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/amiga')
| -rw-r--r-- | xorg-server/xkeyboard-config/keymap/amiga | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/xorg-server/xkeyboard-config/keymap/amiga b/xorg-server/xkeyboard-config/keymap/amiga index d697a986b..10a7142a6 100644 --- a/xorg-server/xkeyboard-config/keymap/amiga +++ b/xorg-server/xkeyboard-config/keymap/amiga @@ -1,22 +1,15 @@ -// $Xorg: amiga,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/keymap/amiga,v 3.2 1997/10/26 13:25:36 dawes Exp $ - -default xkb_keymap "usa1" { - xkb_keycodes { include "amiga(usa1)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "amiga(usa1)" }; - xkb_geometry { include "amiga(usa1)" }; -}; - -xkb_keymap "de" { - xkb_keycodes { include "amiga(de)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "amiga(de)" }; - xkb_geometry { include "amiga(de)" }; -}; +default xkb_keymap "usa1" {
+ xkb_keycodes { include "amiga(usa1)" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "amiga(usa1)" };
+ xkb_geometry { include "amiga(usa1)" };
+};
+
+xkb_keymap "de" {
+ xkb_keycodes { include "amiga(de)" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "amiga(de)" };
+ xkb_geometry { include "amiga(de)" };
+};
|